change file name

Author: Peng Hu

src/main/java/info/xiaomo/gengine/network/NetworkServiceImpl.java

@@ -148,7 +148,7 @@ protected void initChannel(Channel ch) {
             pip.addLast(new WebSocketServerProtocolHandler("/"));
             pip.addLast(new WebSocketDecoder());
             pip.addLast(new WebSocketEncoder());
-            pip.addLast(new DefaultProtobufDecoder(builder.getMessagePool()));
+            pip.addLast(new MessageDecoder(builder.getMessagePool()));
             pip.addLast(
                     new MessageExecutor(
                             builder.getConsumer(),
@@ -176,9 +176,9 @@ protected void initChannel(Channel ch) {
             int lengthFieldLength = 4;
             int ignoreLength = 0;
             pip.addLast(new LengthFieldBasedFrameDecoder(maxLength, offset, lengthFieldLength, ignoreLength, lengthFieldLength));
-            pip.addLast(new DefaultProtobufDecoder(builder.getMessagePool()));
+            pip.addLast(new MessageDecoder(builder.getMessagePool()));
             pip.addLast(new LengthFieldPrepender(4));
-            pip.addLast(new DefaultProtobufEncoder(builder.getMessagePool()));
+            pip.addLast(new MessageEncoder(builder.getMessagePool()));
             pip.addLast(
                     new MessageExecutor(
                             builder.getConsumer(),

src/main/java/info/xiaomo/gengine/network/client/Client.java

@@ -8,8 +8,8 @@
 import java.util.concurrent.*;
 import info.xiaomo.gengine.network.client.listener.ChannelConnectListener;
 import info.xiaomo.gengine.network.client.listener.ChannelDisconnectedListener;
-import info.xiaomo.gengine.network.handler.DefaultProtobufDecoder;
-import info.xiaomo.gengine.network.handler.DefaultProtobufEncoder;
+import info.xiaomo.gengine.network.handler.MessageDecoder;
+import info.xiaomo.gengine.network.handler.MessageEncoder;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.*;
 import io.netty.channel.nio.NioEventLoopGroup;
@@ -91,9 +91,9 @@ protected void initChannel(SocketChannel ch) {
                                     "Idle", new IdleStateHandler(builder.getMaxIdleTime(), 0, 0));
                         }
                         pip.addLast(new LengthFieldBasedFrameDecoder(1048576, 0, 4, 0, 4));
-                        pip.addLast(new DefaultProtobufDecoder(builder.getMsgPool()));
+                        pip.addLast(new MessageDecoder(builder.getMsgPool()));
                         pip.addLast(new LengthFieldPrepender(4));
-                        pip.addLast(new DefaultProtobufEncoder(builder.getMsgPool()));
+                        pip.addLast(new MessageEncoder(builder.getMsgPool()));
                         pip.addLast(
                                 "NettyMessageExecutor",
                                 new ClientMessageExecutor(

…work/handler/DefaultProtobufDecoder.java …gine/network/handler/MessageDecoder.javasrc/main/java/info/xiaomo/gengine/network/handler/DefaultProtobufDecoder.java renamed to src/main/java/info/xiaomo/gengine/network/handler/MessageDecoder.java src/main/java/info/xiaomo/gengine/network/handler/DefaultProtobufDecoder.java renamed to src/main/java/info/xiaomo/gengine/network/handler/MessageDecoder.java

@@ -1,26 +1,28 @@
 package info.xiaomo.gengine.network.handler;
 
 import com.google.protobuf.Message;
+
 import java.util.List;
 import java.util.Objects;
+
 import info.xiaomo.gengine.network.IMessagePool;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.ByteToMessageDecoder;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-public class DefaultProtobufDecoder extends ByteToMessageDecoder {
+public class MessageDecoder extends ByteToMessageDecoder {
 
-    private IMessagePool pool;
+    private final IMessagePool pool;
 
-    public DefaultProtobufDecoder(IMessagePool pool) {
+    public MessageDecoder(IMessagePool pool) {
         this.pool = pool;
     }
 
     @Override
     protected void decode(
-            ChannelHandlerContext channelHandlerContext, ByteBuf byteBuf, List<Object> list)
+            ChannelHandlerContext channelHandlerContext, ByteBuf byteBuf, List<Object> out)
             throws Exception {
         int msgId = byteBuf.readInt();
         byte[] bytes = new byte[byteBuf.readableBytes()];
@@ -30,7 +32,8 @@ protected void decode(
 
         if (message == null) {
             log.error("解码到未注册的消息id:{}", msgId);
+            return;
         }
-        list.add(Objects.requireNonNull(message).getParserForType().parseFrom(bytes));
+        out.add(message.getParserForType().parseFrom(bytes));
     }
 }

…work/handler/DefaultProtobufEncoder.java …gine/network/handler/MessageEncoder.javasrc/main/java/info/xiaomo/gengine/network/handler/DefaultProtobufEncoder.java renamed to src/main/java/info/xiaomo/gengine/network/handler/MessageEncoder.java src/main/java/info/xiaomo/gengine/network/handler/DefaultProtobufEncoder.java renamed to src/main/java/info/xiaomo/gengine/network/handler/MessageEncoder.java

@@ -8,11 +8,11 @@
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-public class DefaultProtobufEncoder extends MessageToByteEncoder<Message> {
+public class MessageEncoder extends MessageToByteEncoder<Message> {
 
-    private IMessagePool pool;
+    private final IMessagePool pool;
 
-    public DefaultProtobufEncoder(IMessagePool pool) {
+    public MessageEncoder(IMessagePool pool) {
         this.pool = pool;
     }
 
@@ -31,6 +31,7 @@ protected void encode(
         boolean writable = byteBuf.isWritable(length);
         if (!writable) {
             log.error("消息过大，编码失败:{}:{}", msgId, length);
+            return;
         }
 
         byteBuf.writeInt(msgId);