tiennm99/zfoo
1
0
Fork 0
mirror of https://github.com/tiennm99/zfoo.git synced 2026-08-17 08:25:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

ref[net]: No need to inherit the IPacket interface anymore

Browse Source
This commit is contained in:
godotg
2023-09-09 09:55:17 +08:00
parent 9f7e9e0c3f
commit 3e8f5ffa7d
5 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/src/main/java/com/zfoo/net/consumer/balancer/AbstractConsumerLoadBalancer.java
+1 -2
View File
@@ -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;
net/src/main/java/com/zfoo/net/handler/codec/jprotobuf/JProtobufTcpCodecHandler.java
+1 -2
View File
@@ -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 {
net/src/main/java/com/zfoo/net/handler/codec/json/JsonWebSocketCodecHandler.java
+1 -2
View File
@@ -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
net/src/main/java/com/zfoo/net/packet/common/Error.java
+3 -4
View File
@@ -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);
}
net/src/main/java/com/zfoo/net/packet/common/Message.java
+2 -3
View File
@@ -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);
}