完善代码

Author: Evan Hu

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

@@ -1,6 +1,7 @@
 package info.xiaomo.gengine.network;
 
 import com.google.protobuf.Message;
+import com.google.protobuf.ProtocolMessageEnum;
 
 /** @author xiaomo */
 public interface IMessagePool {
@@ -19,7 +20,7 @@ public interface IMessagePool {
      * @param message message
      * @return int
      */
-    int getMessageId(Message message);
+    Integer getMessageId(Message message);
 
     /**
      * 获取handler
@@ -37,11 +38,15 @@ public interface IMessagePool {
      */
     void register(int messageId, Message messageClazz, Class<? extends AbstractHandler> handler);
 
+    void register(ProtocolMessageEnum messageId, Message messageClazz, Class<? extends AbstractHandler> handler);
+
     /**
      * 注册
      *
      * @param messageId messageId
      * @param messageClazz messageClazz
      */
     void register(int messageId, Message messageClazz);
+
+    void register(ProtocolMessageEnum messageId, Message messageClazz);
 }

src/main/java/info/xiaomo/gengine/network/handler/DefaultProtobufEncoder.java

@@ -19,8 +19,8 @@ public DefaultProtobufEncoder(IMessagePool pool) {
     @Override
     protected void encode(
             ChannelHandlerContext channelHandlerContext, Message message, ByteBuf byteBuf) {
-        int msgId = pool.getMessageId(message);
-        if (msgId == 0) {
+        Integer msgId = pool.getMessageId(message);
+        if (msgId == null) {
             log.error("消息未注册:{}", message.getClass().getSimpleName());
             return;
         }

src/main/java/info/xiaomo/gengine/network/handler/MessageExecutor.java

@@ -30,9 +30,9 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
 
     @Override
     public void channelRead0(ChannelHandlerContext ctx, Message message) {
-        int msgId = pool.getMessageId(message);
+        Integer msgId = pool.getMessageId(message);
 
-        if (msgId == 0) {
+        if (msgId == null) {
             log.error("请求消息未设置msgId");
             return;
         }

src/main/java/info/xiaomo/gengine/network/pool/MessagePool.java

@@ -1,6 +1,7 @@
 package info.xiaomo.gengine.network.pool;
 
 import com.google.protobuf.Message;
+import com.google.protobuf.ProtocolMessageEnum;
 import java.util.HashMap;
 import java.util.Map;
 import info.xiaomo.gengine.network.AbstractHandler;
@@ -9,48 +10,61 @@
 /** desc : 消息池的父类 Copyright(©) 2017 by xiaomo. */
 public class MessagePool implements IMessagePool {
 
-  /** 消息类字典 */
-  public static final Map<Integer, Message> messages = new HashMap<>(10);
+    /** 消息类字典 */
+    public static final Map<Integer, Message> messages = new HashMap<>(10);
 
-  /** 类和 */
-  private final Map<String, Integer> ids = new HashMap<>(10);
+    /** 类和 */
+    private final Map<String, Integer> ids = new HashMap<>(10);
 
-  private final Map<Integer, Class<? extends AbstractHandler>> handlers = new HashMap<>(10);
+    private final Map<Integer, Class<? extends AbstractHandler>> handlers = new HashMap<>(10);
 
-  @Override
-  public Message getMessage(int messageId) {
-    return messages.get(messageId);
-  }
+    @Override
+    public Message getMessage(int messageId) {
+        return messages.get(messageId);
+    }
 
-  @Override
-  public int getMessageId(Message message) {
-    return ids.get(message.getClass().getName());
-  }
+    @Override
+    public Integer getMessageId(Message message) {
+        return ids.get(message.getClass().getName());
+    }
 
-  @Override
-  public AbstractHandler getHandler(int messageId) {
-    Class<? extends AbstractHandler> clazz = handlers.get(messageId);
-    if (clazz != null) {
-      try {
-        return clazz.getDeclaredConstructor().newInstance();
-      } catch (Exception e) {
+    @Override
+    public AbstractHandler getHandler(int messageId) {
+        Class<? extends AbstractHandler> clazz = handlers.get(messageId);
+        if (clazz != null) {
+            try {
+                return clazz.getDeclaredConstructor().newInstance();
+            } catch (Exception e) {
+                return null;
+            }
+        }
         return null;
-      }
     }
-    return null;
-  }
-
-  @Override
-  public void register(
-      int messageId, Message messageClazz, Class<? extends AbstractHandler> handler) {
-    messages.put(messageId, messageClazz);
-    handlers.put(messageId, handler);
-    ids.put(messageClazz.getClass().getName(), messageId);
-  }
-
-  @Override
-  public void register(int messageId, Message messageClazz) {
-    messages.put(messageId, messageClazz);
-    ids.put(messageClazz.getClass().getName(), messageId);
-  }
+
+    @Override
+    public void register(
+            int messageId, Message messageClazz, Class<? extends AbstractHandler> handler) {
+        messages.put(messageId, messageClazz);
+        handlers.put(messageId, handler);
+        ids.put(messageClazz.getClass().getName(), messageId);
+    }
+
+    @Override
+    public void register(
+            ProtocolMessageEnum messageId,
+            Message messageClazz,
+            Class<? extends AbstractHandler> handler) {
+        register(messageId.getNumber(), messageClazz, handler);
+    }
+
+    @Override
+    public void register(int messageId, Message messageClazz) {
+        messages.put(messageId, messageClazz);
+        ids.put(messageClazz.getClass().getName(), messageId);
+    }
+
+    @Override
+    public void register(ProtocolMessageEnum messageId, Message messageClazz) {
+        register(messageId.getNumber(), messageClazz);
+    }
 }

src/main/java/info/xiaomo/gengine/network/pool/MessageRouter.java

@@ -1,6 +1,7 @@
 package info.xiaomo.gengine.network.pool;
 
 import com.google.protobuf.Message;
+import com.sun.istack.internal.Nullable;
 import java.util.HashMap;
 import java.util.Map;
 import info.xiaomo.gengine.network.*;
@@ -42,10 +43,21 @@ public void consume(Message message, Channel channel) {
             return;
         }
 
-        int msgId = msgPool.getMessageId(message);
+        Integer msgId = msgPool.getMessageId(message);
+
+        if (msgId == null) {
+            log.error("消息未注册:{}", message);
+            return;
+        }
+
         log.debug("收到消息:" + msgId);
 
-        AbstractHandler handler = msgPool.getHandler(msgId);
+        @Nullable AbstractHandler handler = msgPool.getHandler(msgId);
+        if (handler == null) {
+            log.error("msgId:{} 未注册handler", msgId);
+            return;
+        }
+
         handler.setMessage(message);
         handler.setParam(session);
         handler.setSession(session);