From 3e8f5ffa7d444ae91663d6f8f0b1d8934728c6fa Mon Sep 17 00:00:00 2001
From: godotg <jaysunxiao@gmail.com>
Date: Sat, 9 Sep 2023 09:55:17 +0800
Subject: [PATCH] ref[net]: No need to inherit the IPacket interface anymore

---
 .../consumer/balancer/AbstractConsumerLoadBalancer.java    | 3 +--
 .../handler/codec/jprotobuf/JProtobufTcpCodecHandler.java  | 3 +--
 .../net/handler/codec/json/JsonWebSocketCodecHandler.java  | 3 +--
 net/src/main/java/com/zfoo/net/packet/common/Error.java    | 7 +++----
 net/src/main/java/com/zfoo/net/packet/common/Message.java  | 5 ++---
 5 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/net/src/main/java/com/zfoo/net/consumer/balancer/AbstractConsumerLoadBalancer.java b/net/src/main/java/com/zfoo/net/consumer/balancer/AbstractConsumerLoadBalancer.java
index fccac580..8834412c 100644
--- a/net/src/main/java/com/zfoo/net/consumer/balancer/AbstractConsumerLoadBalancer.java
+++ b/net/src/main/java/com/zfoo/net/consumer/balancer/AbstractConsumerLoadBalancer.java
@@ -15,7 +15,6 @@ package com.zfoo.net.consumer.balancer;
 
 import com.zfoo.net.NetContext;
 import com.zfoo.net.consumer.registry.RegisterVO;
-import com.zfoo.net.packet.IPacket;
 import com.zfoo.net.session.Session;
 import com.zfoo.protocol.ProtocolManager;
 import com.zfoo.protocol.registration.ProtocolModule;
@@ -64,7 +63,7 @@ public abstract class AbstractConsumerLoadBalancer implements IConsumerLoadBalan
         return list;
     }
 
-    public boolean sessionHasModule(Session session, IPacket packet) {
+    public boolean sessionHasModule(Session session, Object packet) {
         var consumerAttribute = session.getConsumerAttribute();
         if (Objects.isNull(consumerAttribute)) {
             return false;
diff --git a/net/src/main/java/com/zfoo/net/handler/codec/jprotobuf/JProtobufTcpCodecHandler.java b/net/src/main/java/com/zfoo/net/handler/codec/jprotobuf/JProtobufTcpCodecHandler.java
index 86b221ea..53d47c40 100644
--- a/net/src/main/java/com/zfoo/net/handler/codec/jprotobuf/JProtobufTcpCodecHandler.java
+++ b/net/src/main/java/com/zfoo/net/handler/codec/jprotobuf/JProtobufTcpCodecHandler.java
@@ -17,7 +17,6 @@ import com.baidu.bjf.remoting.protobuf.Codec;
 import com.baidu.bjf.remoting.protobuf.ProtobufProxy;
 import com.zfoo.net.packet.DecodedPacketInfo;
 import com.zfoo.net.packet.EncodedPacketInfo;
-import com.zfoo.net.packet.IPacket;
 import com.zfoo.net.packet.PacketService;
 import com.zfoo.protocol.ProtocolManager;
 import com.zfoo.protocol.buffer.ByteBufUtils;
@@ -79,7 +78,7 @@ public class JProtobufTcpCodecHandler extends ByteToMessageCodec<EncodedPacketIn
         var bytes = ByteBufUtils.readAllBytes(buffer);
         var packet = protobufCodec.decode(bytes);
 
-        return DecodedPacketInfo.valueOf((IPacket) packet, null);
+        return DecodedPacketInfo.valueOf(packet, null);
     }
 
     public void write(ByteBuf buffer, Object packet, Object attachment) throws IOException {
diff --git a/net/src/main/java/com/zfoo/net/handler/codec/json/JsonWebSocketCodecHandler.java b/net/src/main/java/com/zfoo/net/handler/codec/json/JsonWebSocketCodecHandler.java
index 4b614dc0..703fd2b4 100644
--- a/net/src/main/java/com/zfoo/net/handler/codec/json/JsonWebSocketCodecHandler.java
+++ b/net/src/main/java/com/zfoo/net/handler/codec/json/JsonWebSocketCodecHandler.java
@@ -15,7 +15,6 @@ package com.zfoo.net.handler.codec.json;
 
 import com.zfoo.net.packet.DecodedPacketInfo;
 import com.zfoo.net.packet.EncodedPacketInfo;
-import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.ProtocolManager;
 import com.zfoo.protocol.buffer.ByteBufUtils;
 import com.zfoo.protocol.util.JsonUtils;
@@ -53,7 +52,7 @@ public class JsonWebSocketCodecHandler extends MessageToMessageCodec<WebSocketFr
 
         var protocolClass = ProtocolManager.getProtocol(protocolId).protocolConstructor().getDeclaringClass();
         var packet = JsonUtils.string2Object(packetStr, protocolClass);
-        list.add(DecodedPacketInfo.valueOf((IPacket) packet, attachment));
+        list.add(DecodedPacketInfo.valueOf(packet, attachment));
     }
 
     @Override
diff --git a/net/src/main/java/com/zfoo/net/packet/common/Error.java b/net/src/main/java/com/zfoo/net/packet/common/Error.java
index 3a520806..0f6d2190 100644
--- a/net/src/main/java/com/zfoo/net/packet/common/Error.java
+++ b/net/src/main/java/com/zfoo/net/packet/common/Error.java
@@ -15,7 +15,6 @@ package com.zfoo.net.packet.common;
 
 import com.baidu.bjf.remoting.protobuf.annotation.Protobuf;
 import com.baidu.bjf.remoting.protobuf.annotation.ProtobufClass;
-import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.ProtocolManager;
 import com.zfoo.protocol.anno.Protocol;
 import org.slf4j.helpers.FormattingTuple;
@@ -51,7 +50,7 @@ public class Error {
         return response;
     }
 
-    public static Error valueOf(IPacket packet, int errorCode, String errorMessage) {
+    public static Error valueOf(Object packet, int errorCode, String errorMessage) {
         Error response = new Error();
         response.module = ProtocolManager.getProtocol(packet.getClass()).module();
         response.errorCode = errorCode;
@@ -59,11 +58,11 @@ public class Error {
         return response;
     }
 
-    public static Error valueOf(IPacket packet, int errorCode) {
+    public static Error valueOf(Object packet, int errorCode) {
         return valueOf(packet, errorCode, null);
     }
 
-    public static Error valueOf(IPacket packet, String errorMessage) {
+    public static Error valueOf(Object packet, String errorMessage) {
         return valueOf(packet, 0, errorMessage);
     }
 
diff --git a/net/src/main/java/com/zfoo/net/packet/common/Message.java b/net/src/main/java/com/zfoo/net/packet/common/Message.java
index 00b6f9b7..d411485a 100644
--- a/net/src/main/java/com/zfoo/net/packet/common/Message.java
+++ b/net/src/main/java/com/zfoo/net/packet/common/Message.java
@@ -14,7 +14,6 @@
 package com.zfoo.net.packet.common;
 
 import com.baidu.bjf.remoting.protobuf.annotation.ProtobufClass;
-import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.ProtocolManager;
 import com.zfoo.protocol.anno.Protocol;
 
@@ -45,7 +44,7 @@ public class Message {
         return code == 0;
     }
 
-    public static Message valueOf(IPacket packet, int code, String message) {
+    public static Message valueOf(Object packet, int code, String message) {
         var mess = new Message();
         mess.module = ProtocolManager.moduleByProtocol(packet.getClass()).getId();
         mess.code = code;
@@ -53,7 +52,7 @@ public class Message {
         return mess;
     }
 
-    public static Message valueOf(IPacket packet, int code) {
+    public static Message valueOf(Object packet, int code) {
         return Message.valueOf(packet, code, null);
     }