From 4e45097b34eccc51b7956a024d3bef00f73b286d Mon Sep 17 00:00:00 2001
From: jaysunxiao <jaysunxiao@gmail.com>
Date: Wed, 3 Nov 2021 22:00:19 +0800
Subject: [PATCH] =?UTF-8?q?perf[net]:=20=E7=AE=80=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zfoo/net/handler/GatewayRouteHandler.java   | 4 ++--
 .../com/zfoo/net/handler/idle/ClientIdleHandler.java     | 2 +-
 .../main/java/com/zfoo/net/packet/common/Heartbeat.java  | 9 ---------
 net/src/main/java/com/zfoo/net/packet/common/Ping.java   | 4 ----
 net/src/main/java/com/zfoo/net/router/Router.java        | 2 +-
 5 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/net/src/main/java/com/zfoo/net/handler/GatewayRouteHandler.java b/net/src/main/java/com/zfoo/net/handler/GatewayRouteHandler.java
index 6785391d..cbfdf3de 100644
--- a/net/src/main/java/com/zfoo/net/handler/GatewayRouteHandler.java
+++ b/net/src/main/java/com/zfoo/net/handler/GatewayRouteHandler.java
@@ -64,10 +64,10 @@ public class GatewayRouteHandler extends ServerRouteHandler {
 
         var decodedPacketInfo = (DecodedPacketInfo) msg;
         var packet = decodedPacketInfo.getPacket();
-        if (packet.protocolId() == Heartbeat.heartbeatProtocolId()) {
+        if (packet.protocolId() == Heartbeat.PROTOCOL_ID) {
             return;
         }
-        if (packet.protocolId() == Ping.pingProtocolId()) {
+        if (packet.protocolId() == Ping.PROTOCOL_ID) {
             NetContext.getRouter().send(session, Pong.valueOf(TimeUtils.now()), null);
             return;
         }
diff --git a/net/src/main/java/com/zfoo/net/handler/idle/ClientIdleHandler.java b/net/src/main/java/com/zfoo/net/handler/idle/ClientIdleHandler.java
index d71f1bf2..452b4629 100644
--- a/net/src/main/java/com/zfoo/net/handler/idle/ClientIdleHandler.java
+++ b/net/src/main/java/com/zfoo/net/handler/idle/ClientIdleHandler.java
@@ -33,7 +33,7 @@ public class ClientIdleHandler extends ChannelDuplexHandler {
 
     private static final Logger logger = LoggerFactory.getLogger(ClientIdleHandler.class);
 
-    private static final EncodedPacketInfo heartbeatPacket = EncodedPacketInfo.valueOf(Heartbeat.getInstance(), null);
+    private static final EncodedPacketInfo heartbeatPacket = EncodedPacketInfo.valueOf(new Heartbeat(), null);
 
     @Override
     public void userEventTriggered(ChannelHandlerContext ctx, Object evt) {
diff --git a/net/src/main/java/com/zfoo/net/packet/common/Heartbeat.java b/net/src/main/java/com/zfoo/net/packet/common/Heartbeat.java
index 2df4483d..999ffc11 100644
--- a/net/src/main/java/com/zfoo/net/packet/common/Heartbeat.java
+++ b/net/src/main/java/com/zfoo/net/packet/common/Heartbeat.java
@@ -23,18 +23,9 @@ public class Heartbeat implements IPacket {
 
     public static final transient short PROTOCOL_ID = 102;
 
-    private static Heartbeat INSTANCE = new Heartbeat();
-
-    public static Heartbeat getInstance() {
-        return INSTANCE;
-    }
-
     @Override
     public short protocolId() {
         return PROTOCOL_ID;
     }
 
-    public static short heartbeatProtocolId() {
-        return PROTOCOL_ID;
-    }
 }
diff --git a/net/src/main/java/com/zfoo/net/packet/common/Ping.java b/net/src/main/java/com/zfoo/net/packet/common/Ping.java
index b052e778..3cc01ef8 100644
--- a/net/src/main/java/com/zfoo/net/packet/common/Ping.java
+++ b/net/src/main/java/com/zfoo/net/packet/common/Ping.java
@@ -23,10 +23,6 @@ public class Ping implements IPacket {
 
     public static final transient short PROTOCOL_ID = 103;
 
-    public static short pingProtocolId() {
-        return PROTOCOL_ID;
-    }
-
     @Override
     public short protocolId() {
         return PROTOCOL_ID;
diff --git a/net/src/main/java/com/zfoo/net/router/Router.java b/net/src/main/java/com/zfoo/net/router/Router.java
index baeea293..831ada16 100644
--- a/net/src/main/java/com/zfoo/net/router/Router.java
+++ b/net/src/main/java/com/zfoo/net/router/Router.java
@@ -71,7 +71,7 @@ public class Router implements IRouter {
 
     @Override
     public void receive(Session session, IPacket packet, @Nullable IAttachment attachment) {
-        if (packet.protocolId() == Heartbeat.heartbeatProtocolId()) {
+        if (packet.protocolId() == Heartbeat.PROTOCOL_ID) {
             logger.info("heartbeat");
             return;
         }