From 4d703215e3402cdc5c889e06bc75619a7bc1315c Mon Sep 17 00:00:00 2001 From: godotg Date: Sun, 3 Sep 2023 15:03:55 +0800 Subject: [PATCH] del[protocol]: deprecate PROTOCOL_ID --- .../java/com/zfoo/net/consumer/Consumer.java | 2 +- .../net/core/gateway/model/AuthUidAsk.java | 9 +- .../gateway/model/AuthUidToGatewayCheck.java | 13 +- .../model/AuthUidToGatewayConfirm.java | 9 +- .../model/GatewaySessionInactiveAsk.java | 9 +- .../model/GatewaySynchronizeSidAsk.java | 13 +- .../zfoo/net/handler/GatewayRouteHandler.java | 5 +- .../handler/codec/http/HttpCodecHandler.java | 4 +- .../com/zfoo/net/packet/PacketService.java | 6 +- .../com/zfoo/net/packet/common/Error.java | 14 +- .../com/zfoo/net/packet/common/Heartbeat.java | 11 +- .../com/zfoo/net/packet/common/Message.java | 10 +- .../zfoo/net/packet/common/PairIntLong.java | 9 +- .../com/zfoo/net/packet/common/PairLS.java | 9 +- .../com/zfoo/net/packet/common/PairLong.java | 13 +- .../zfoo/net/packet/common/PairString.java | 9 +- .../java/com/zfoo/net/packet/common/Ping.java | 11 +- .../java/com/zfoo/net/packet/common/Pong.java | 11 +- .../com/zfoo/net/packet/common/TripleLLS.java | 9 +- .../com/zfoo/net/packet/common/TripleLSS.java | 9 +- .../zfoo/net/packet/common/TripleLong.java | 9 +- .../zfoo/net/packet/common/TripleString.java | 9 +- .../main/java/com/zfoo/net/router/Router.java | 8 +- .../router/attachment/GatewayAttachment.java | 9 +- .../net/router/attachment/HttpAttachment.java | 9 +- .../router/attachment/NoAnswerAttachment.java | 11 +- .../router/attachment/SignalAttachment.java | 9 +- .../attachment/SignalOnlyAttachment.java | 10 +- .../net/router/attachment/UdpAttachment.java | 10 +- .../java/com/zfoo/net/packet/CM_Array.java | 9 +- .../java/com/zfoo/net/packet/CM_Float.java | 9 +- .../test/java/com/zfoo/net/packet/CM_Int.java | 9 +- .../java/com/zfoo/net/packet/CM_List.java | 13 +- .../test/java/com/zfoo/net/packet/CM_Map.java | 13 +- .../java/com/zfoo/net/packet/CM_Object.java | 9 +- .../test/java/com/zfoo/net/packet/CM_Set.java | 9 +- .../java/com/zfoo/net/packet/ObjectA.java | 9 +- .../java/com/zfoo/net/packet/ObjectB.java | 9 +- .../java/com/zfoo/net/packet/SM_Float.java | 11 +- .../test/java/com/zfoo/net/packet/SM_Int.java | 10 +- .../java/com/zfoo/net/packet/SM_Object.java | 9 +- .../net/packet/csharp/CM_CSharpRequest.java | 9 +- .../zfoo/net/packet/csharp/CSharpObjectA.java | 8 +- .../zfoo/net/packet/csharp/CSharpObjectB.java | 8 +- .../gateway/GatewayToProviderRequest.java | 9 +- .../gateway/GatewayToProviderResponse.java | 8 +- .../net/packet/http/HttpHelloRequest.java | 9 +- .../net/packet/http/HttpHelloResponse.java | 10 +- .../jprotobuf/JProtobufHelloRequest.java | 9 +- .../jprotobuf/JProtobufHelloResponse.java | 10 +- .../net/packet/json/JsonHelloRequest.java | 10 +- .../net/packet/json/JsonHelloResponse.java | 8 +- .../packet/provider/ProviderMessAnswer.java | 10 +- .../net/packet/provider/ProviderMessAsk.java | 9 +- .../zfoo/net/packet/tcp/AsyncMessAnswer.java | 10 +- .../com/zfoo/net/packet/tcp/AsyncMessAsk.java | 8 +- .../zfoo/net/packet/tcp/SyncMessAnswer.java | 9 +- .../com/zfoo/net/packet/tcp/SyncMessAsk.java | 9 +- .../zfoo/net/packet/tcp/TcpHelloRequest.java | 10 +- .../zfoo/net/packet/tcp/TcpHelloResponse.java | 10 +- .../zfoo/net/packet/udp/UdpHelloRequest.java | 11 +- .../zfoo/net/packet/udp/UdpHelloResponse.java | 11 +- .../packet/websocket/WebSocketObjectA.java | 9 +- .../packet/websocket/WebSocketObjectB.java | 9 +- .../websocket/WebSocketPacketRequest.java | 9 +- .../websocket/WebsocketHelloRequest.java | 9 +- .../websocket/WebsocketHelloResponse.java | 11 +- protocol/README.md | 20 +-- protocol/README_CN.md | 20 +-- .../main/java/com/zfoo/protocol/IPacket.java | 2 - .../registration/ProtocolAnalysis.java | 6 +- .../zfoo/protocol/buffer/model/MyObjectA.java | 9 +- .../zfoo/protocol/buffer/model/MyObjectB.java | 9 +- .../zfoo/protocol/buffer/model/MyPacket.java | 156 ------------------ .../collection/lpmap/model/MyPacket.java | 9 +- 75 files changed, 147 insertions(+), 714 deletions(-) delete mode 100644 protocol/src/test/java/com/zfoo/protocol/buffer/model/MyPacket.java diff --git a/net/src/main/java/com/zfoo/net/consumer/Consumer.java b/net/src/main/java/com/zfoo/net/consumer/Consumer.java index 7b59be75..b1d5c953 100644 --- a/net/src/main/java/com/zfoo/net/consumer/Consumer.java +++ b/net/src/main/java/com/zfoo/net/consumer/Consumer.java @@ -104,7 +104,7 @@ public class Consumer implements IConsumer { IPacket responsePacket = clientSignalAttachment.getResponseFuture().get(Router.DEFAULT_TIMEOUT, TimeUnit.MILLISECONDS); - if (responsePacket.protocolId() == Error.errorProtocolId()) { + if (responsePacket.getClass() == Error.class) { throw new ErrorResponseException((Error) responsePacket); } if (answerClass != null && answerClass != responsePacket.getClass()) { diff --git a/net/src/main/java/com/zfoo/net/core/gateway/model/AuthUidAsk.java b/net/src/main/java/com/zfoo/net/core/gateway/model/AuthUidAsk.java index 1b0f43c5..aab8fc2f 100644 --- a/net/src/main/java/com/zfoo/net/core/gateway/model/AuthUidAsk.java +++ b/net/src/main/java/com/zfoo/net/core/gateway/model/AuthUidAsk.java @@ -14,15 +14,15 @@ package com.zfoo.net.core.gateway.model; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ +@Protocol(id = 22) public class AuthUidAsk implements IPacket { - public static final short PROTOCOL_ID = 22; - private String gatewayHostAndPort; private long sid; @@ -36,11 +36,6 @@ public class AuthUidAsk implements IPacket { return ask; } - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public String getGatewayHostAndPort() { return gatewayHostAndPort; } diff --git a/net/src/main/java/com/zfoo/net/core/gateway/model/AuthUidToGatewayCheck.java b/net/src/main/java/com/zfoo/net/core/gateway/model/AuthUidToGatewayCheck.java index 3d000de2..3c9956c1 100644 --- a/net/src/main/java/com/zfoo/net/core/gateway/model/AuthUidToGatewayCheck.java +++ b/net/src/main/java/com/zfoo/net/core/gateway/model/AuthUidToGatewayCheck.java @@ -14,6 +14,7 @@ package com.zfoo.net.core.gateway.model; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * 网关登录成功过后，将uid授权给网关 @@ -21,10 +22,9 @@ import com.zfoo.protocol.IPacket; * @author godotg * @version 3.0 */ +@Protocol(id = 20) public class AuthUidToGatewayCheck implements IPacket { - public static final short PROTOCOL_ID = 20; - private long uid; public static AuthUidToGatewayCheck valueOf(long uid) { @@ -33,15 +33,6 @@ public class AuthUidToGatewayCheck implements IPacket { return authUidToGateway; } - public static long getAuthProtocolId() { - return PROTOCOL_ID; - } - - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public long getUid() { return uid; } diff --git a/net/src/main/java/com/zfoo/net/core/gateway/model/AuthUidToGatewayConfirm.java b/net/src/main/java/com/zfoo/net/core/gateway/model/AuthUidToGatewayConfirm.java index 86da4b97..058e1834 100644 --- a/net/src/main/java/com/zfoo/net/core/gateway/model/AuthUidToGatewayConfirm.java +++ b/net/src/main/java/com/zfoo/net/core/gateway/model/AuthUidToGatewayConfirm.java @@ -14,6 +14,7 @@ package com.zfoo.net.core.gateway.model; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * 网关登录成功过后，将uid授权给网关的返回 @@ -21,10 +22,9 @@ import com.zfoo.protocol.IPacket; * @author godotg * @version 3.0 */ +@Protocol(id = 21) public class AuthUidToGatewayConfirm implements IPacket { - public static final short PROTOCOL_ID = 21; - private long uid; public static AuthUidToGatewayConfirm valueOf(long uid) { @@ -33,11 +33,6 @@ public class AuthUidToGatewayConfirm implements IPacket { return authUidToGateway; } - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public long getUid() { return uid; } diff --git a/net/src/main/java/com/zfoo/net/core/gateway/model/GatewaySessionInactiveAsk.java b/net/src/main/java/com/zfoo/net/core/gateway/model/GatewaySessionInactiveAsk.java index 4122dc99..52eb7ec0 100644 --- a/net/src/main/java/com/zfoo/net/core/gateway/model/GatewaySessionInactiveAsk.java +++ b/net/src/main/java/com/zfoo/net/core/gateway/model/GatewaySessionInactiveAsk.java @@ -14,15 +14,15 @@ package com.zfoo.net.core.gateway.model; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ +@Protocol(id = 23) public class GatewaySessionInactiveAsk implements IPacket { - public static final short PROTOCOL_ID = 23; - private String gatewayHostAndPort; private long sid; @@ -36,11 +36,6 @@ public class GatewaySessionInactiveAsk implements IPacket { return ask; } - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public String getGatewayHostAndPort() { return gatewayHostAndPort; } diff --git a/net/src/main/java/com/zfoo/net/core/gateway/model/GatewaySynchronizeSidAsk.java b/net/src/main/java/com/zfoo/net/core/gateway/model/GatewaySynchronizeSidAsk.java index 423d520d..4c87614b 100644 --- a/net/src/main/java/com/zfoo/net/core/gateway/model/GatewaySynchronizeSidAsk.java +++ b/net/src/main/java/com/zfoo/net/core/gateway/model/GatewaySynchronizeSidAsk.java @@ -14,6 +14,7 @@ package com.zfoo.net.core.gateway.model; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; import java.util.Map; @@ -23,10 +24,9 @@ import java.util.Map; * @author godotg * @version 3.0 */ +@Protocol(id = 24) public class GatewaySynchronizeSidAsk implements IPacket { - public static final short PROTOCOL_ID = 24; - private String gatewayHostAndPort; private Map sidMap; @@ -38,15 +38,6 @@ public class GatewaySynchronizeSidAsk implements IPacket { return ask; } - @Override - public short protocolId() { - return PROTOCOL_ID; - } - - public static short gatewaySynchronizeProtocolId() { - return PROTOCOL_ID; - } - public Map getSidMap() { return sidMap; } 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 529d2dbb..df0deb68 100644 --- a/net/src/main/java/com/zfoo/net/handler/GatewayRouteHandler.java +++ b/net/src/main/java/com/zfoo/net/handler/GatewayRouteHandler.java @@ -24,7 +24,6 @@ import com.zfoo.net.packet.common.Ping; import com.zfoo.net.packet.common.Pong; import com.zfoo.net.router.attachment.GatewayAttachment; import com.zfoo.net.router.attachment.IAttachment; -import com.zfoo.net.router.attachment.SignalAttachment; import com.zfoo.net.session.Session; import com.zfoo.net.util.SessionUtils; import com.zfoo.protocol.IPacket; @@ -68,10 +67,10 @@ public class GatewayRouteHandler extends ServerRouteHandler { var decodedPacketInfo = (DecodedPacketInfo) msg; var packet = decodedPacketInfo.getPacket(); - if (packet.protocolId() == Heartbeat.PROTOCOL_ID) { + if (packet.getClass() == Heartbeat.class) { return; } - if (packet.protocolId() == Ping.PROTOCOL_ID) { + if (packet.getClass() == Ping.class) { NetContext.getRouter().send(session, Pong.valueOf(TimeUtils.now()), null); return; } diff --git a/net/src/main/java/com/zfoo/net/handler/codec/http/HttpCodecHandler.java b/net/src/main/java/com/zfoo/net/handler/codec/http/HttpCodecHandler.java index 9a9d2ad0..632c575c 100644 --- a/net/src/main/java/com/zfoo/net/handler/codec/http/HttpCodecHandler.java +++ b/net/src/main/java/com/zfoo/net/handler/codec/http/HttpCodecHandler.java @@ -22,8 +22,6 @@ import com.zfoo.protocol.util.StringUtils; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToMessageCodec; import io.netty.handler.codec.http.*; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.util.List; import java.util.function.Function; @@ -55,7 +53,7 @@ public class HttpCodecHandler extends MessageToMessageCodec netGenerateProtocolFilter = registration -> ProtocolManager.moduleByModuleId(registration.module()).getName().matches(NET_COMMON_MODULE) 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 06a1761d..bb4a4e33 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 @@ -13,11 +13,11 @@ package com.zfoo.net.packet.common; -import com.baidu.bjf.remoting.protobuf.annotation.Ignore; import com.baidu.bjf.remoting.protobuf.annotation.Protobuf; import com.baidu.bjf.remoting.protobuf.annotation.ProtobufClass; import com.zfoo.protocol.IPacket; import com.zfoo.protocol.ProtocolManager; +import com.zfoo.protocol.anno.Protocol; import org.slf4j.helpers.FormattingTuple; import org.slf4j.helpers.MessageFormatter; @@ -26,9 +26,8 @@ import org.slf4j.helpers.MessageFormatter; * @version 3.0 */ @ProtobufClass +@Protocol(id = 101) public class Error implements IPacket { - @Ignore - public static final short PROTOCOL_ID = 101; @Protobuf(order = 1) private int module; @@ -37,15 +36,6 @@ public class Error implements IPacket { @Protobuf(order = 3) private String errorMessage; - @Override - public short protocolId() { - return PROTOCOL_ID; - } - - public static short errorProtocolId() { - return PROTOCOL_ID; - } - @Override public String toString() { FormattingTuple message = MessageFormatter.arrayFormat( 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 92d6b3d8..8f511ca3 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 @@ -13,23 +13,16 @@ package com.zfoo.net.packet.common; -import com.baidu.bjf.remoting.protobuf.annotation.Ignore; import com.baidu.bjf.remoting.protobuf.annotation.ProtobufClass; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ @ProtobufClass +@Protocol(id = 102) public class Heartbeat implements IPacket { - @Ignore - public static final short PROTOCOL_ID = 102; - - @Override - public short protocolId() { - return PROTOCOL_ID; - } - } 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 ba2a5663..046cf247 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 @@ -13,10 +13,10 @@ package com.zfoo.net.packet.common; -import com.baidu.bjf.remoting.protobuf.annotation.Ignore; import com.baidu.bjf.remoting.protobuf.annotation.ProtobufClass; import com.zfoo.protocol.IPacket; import com.zfoo.protocol.ProtocolManager; +import com.zfoo.protocol.anno.Protocol; /** * 通用的返回，既可以用在远程调用，又可以嵌套在其它协议里 @@ -25,9 +25,8 @@ import com.zfoo.protocol.ProtocolManager; * @version 3.0 */ @ProtobufClass +@Protocol(id = 100) public class Message implements IPacket { - @Ignore - public static final short PROTOCOL_ID = 100; private byte module; @@ -86,11 +85,6 @@ public class Message implements IPacket { return mess; } - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public byte getModule() { return module; } diff --git a/net/src/main/java/com/zfoo/net/packet/common/PairIntLong.java b/net/src/main/java/com/zfoo/net/packet/common/PairIntLong.java index 3c87a433..26909305 100644 --- a/net/src/main/java/com/zfoo/net/packet/common/PairIntLong.java +++ b/net/src/main/java/com/zfoo/net/packet/common/PairIntLong.java @@ -16,6 +16,7 @@ package com.zfoo.net.packet.common; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; import java.util.Objects; @@ -23,10 +24,9 @@ import java.util.Objects; * @author godotg * @version 3.0 */ +@Protocol(id = 110) public class PairIntLong implements IPacket { - public static final short PROTOCOL_ID = 110; - @JsonSerialize(using = ToStringSerializer.class) private int key; @@ -40,11 +40,6 @@ public class PairIntLong implements IPacket { return pair; } - @Override - public short protocolId() { - return PROTOCOL_ID; - } - @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/net/src/main/java/com/zfoo/net/packet/common/PairLS.java b/net/src/main/java/com/zfoo/net/packet/common/PairLS.java index 51291219..780cf88b 100644 --- a/net/src/main/java/com/zfoo/net/packet/common/PairLS.java +++ b/net/src/main/java/com/zfoo/net/packet/common/PairLS.java @@ -16,6 +16,7 @@ package com.zfoo.net.packet.common; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * Long + String @@ -23,10 +24,9 @@ import com.zfoo.protocol.IPacket; * @author godotg * @version 3.0 */ +@Protocol(id = 113) public class PairLS implements IPacket { - public static final short PROTOCOL_ID = 113; - @JsonSerialize(using = ToStringSerializer.class) private long key; @@ -39,11 +39,6 @@ public class PairLS implements IPacket { return pair; } - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public long getKey() { return key; } diff --git a/net/src/main/java/com/zfoo/net/packet/common/PairLong.java b/net/src/main/java/com/zfoo/net/packet/common/PairLong.java index f1b4f5c5..682505b0 100644 --- a/net/src/main/java/com/zfoo/net/packet/common/PairLong.java +++ b/net/src/main/java/com/zfoo/net/packet/common/PairLong.java @@ -16,19 +16,15 @@ package com.zfoo.net.packet.common; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.zfoo.protocol.IPacket; - -import java.util.Comparator; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ +@Protocol(id = 111) public class PairLong implements IPacket { - public static final short PROTOCOL_ID = 111; - - public static transient final Comparator NATURAL_VALUE_COMPARATOR = (a, b) -> Long.compare(a.getValue(), b.getValue()); - @JsonSerialize(using = ToStringSerializer.class) private long key; @@ -42,11 +38,6 @@ public class PairLong implements IPacket { return pair; } - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public long getKey() { return key; } diff --git a/net/src/main/java/com/zfoo/net/packet/common/PairString.java b/net/src/main/java/com/zfoo/net/packet/common/PairString.java index 4ff26d13..fecf06e2 100644 --- a/net/src/main/java/com/zfoo/net/packet/common/PairString.java +++ b/net/src/main/java/com/zfoo/net/packet/common/PairString.java @@ -14,15 +14,15 @@ package com.zfoo.net.packet.common; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ +@Protocol(id = 112) public class PairString implements IPacket { - public static final short PROTOCOL_ID = 112; - private String key; private String value; @@ -34,11 +34,6 @@ public class PairString implements IPacket { return pair; } - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public String getKey() { return key; } 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 c7d60812..58ffdec2 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 @@ -13,23 +13,16 @@ package com.zfoo.net.packet.common; -import com.baidu.bjf.remoting.protobuf.annotation.Ignore; import com.baidu.bjf.remoting.protobuf.annotation.ProtobufClass; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ @ProtobufClass +@Protocol(id = 103) public class Ping implements IPacket { - @Ignore - public static final short PROTOCOL_ID = 103; - - @Override - public short protocolId() { - return PROTOCOL_ID; - } - } diff --git a/net/src/main/java/com/zfoo/net/packet/common/Pong.java b/net/src/main/java/com/zfoo/net/packet/common/Pong.java index 9df4a762..fc44c8c3 100644 --- a/net/src/main/java/com/zfoo/net/packet/common/Pong.java +++ b/net/src/main/java/com/zfoo/net/packet/common/Pong.java @@ -13,21 +13,19 @@ package com.zfoo.net.packet.common; -import com.baidu.bjf.remoting.protobuf.annotation.Ignore; import com.baidu.bjf.remoting.protobuf.annotation.Protobuf; import com.baidu.bjf.remoting.protobuf.annotation.ProtobufClass; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ @ProtobufClass +@Protocol(id = 104) public class Pong implements IPacket { - @Ignore - public static final short PROTOCOL_ID = 104; - /** * 服务器当前的时间戳 */ @@ -40,11 +38,6 @@ public class Pong implements IPacket { return pong; } - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public long getTime() { return time; } diff --git a/net/src/main/java/com/zfoo/net/packet/common/TripleLLS.java b/net/src/main/java/com/zfoo/net/packet/common/TripleLLS.java index e7f7372b..3a8e1546 100644 --- a/net/src/main/java/com/zfoo/net/packet/common/TripleLLS.java +++ b/net/src/main/java/com/zfoo/net/packet/common/TripleLLS.java @@ -16,15 +16,15 @@ package com.zfoo.net.packet.common; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ +@Protocol(id = 117) public class TripleLLS implements IPacket { - public static final short PROTOCOL_ID = 117; - @JsonSerialize(using = ToStringSerializer.class) private long left; @JsonSerialize(using = ToStringSerializer.class) @@ -39,11 +39,6 @@ public class TripleLLS implements IPacket { return triple; } - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public long getLeft() { return left; } diff --git a/net/src/main/java/com/zfoo/net/packet/common/TripleLSS.java b/net/src/main/java/com/zfoo/net/packet/common/TripleLSS.java index 657d8502..d25c6fbf 100644 --- a/net/src/main/java/com/zfoo/net/packet/common/TripleLSS.java +++ b/net/src/main/java/com/zfoo/net/packet/common/TripleLSS.java @@ -16,6 +16,7 @@ package com.zfoo.net.packet.common; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * Long + String + String @@ -23,10 +24,9 @@ import com.zfoo.protocol.IPacket; * @author godotg * @version 3.0 */ +@Protocol(id = 116) public class TripleLSS implements IPacket { - public static final short PROTOCOL_ID = 116; - @JsonSerialize(using = ToStringSerializer.class) private long left; private String middle; @@ -40,11 +40,6 @@ public class TripleLSS implements IPacket { return triple; } - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public long getLeft() { return left; } diff --git a/net/src/main/java/com/zfoo/net/packet/common/TripleLong.java b/net/src/main/java/com/zfoo/net/packet/common/TripleLong.java index 1f362559..b6f05cfe 100644 --- a/net/src/main/java/com/zfoo/net/packet/common/TripleLong.java +++ b/net/src/main/java/com/zfoo/net/packet/common/TripleLong.java @@ -16,15 +16,15 @@ package com.zfoo.net.packet.common; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ +@Protocol(id = 114) public class TripleLong implements IPacket { - public static final short PROTOCOL_ID = 114; - @JsonSerialize(using = ToStringSerializer.class) private long left; @JsonSerialize(using = ToStringSerializer.class) @@ -40,11 +40,6 @@ public class TripleLong implements IPacket { return triple; } - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public long getLeft() { return left; } diff --git a/net/src/main/java/com/zfoo/net/packet/common/TripleString.java b/net/src/main/java/com/zfoo/net/packet/common/TripleString.java index f859dfff..66bef715 100644 --- a/net/src/main/java/com/zfoo/net/packet/common/TripleString.java +++ b/net/src/main/java/com/zfoo/net/packet/common/TripleString.java @@ -14,15 +14,15 @@ package com.zfoo.net.packet.common; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ +@Protocol(id = 115) public class TripleString implements IPacket { - public static final short PROTOCOL_ID = 115; - private String left; private String middle; private String right; @@ -35,11 +35,6 @@ public class TripleString implements IPacket { return triple; } - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public String getLeft() { return left; } 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 5f11b3c0..0044f60b 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.PROTOCOL_ID) { + if (packet.getClass() == Heartbeat.class) { logger.info("heartbeat"); return; } @@ -116,7 +116,7 @@ public class Router implements IRouter { // 网关授权，授权完成直接返回 // 注意：这个 AuthUidToGatewayCheck 是在home的LoginController中处理完登录后，把消息发给网关进行授权 - if (AuthUidToGatewayCheck.getAuthProtocolId() == packet.protocolId()) { + if (AuthUidToGatewayCheck.class == packet.getClass()) { var uid = ((AuthUidToGatewayCheck) packet).getUid(); if (uid <= 0) { logger.error("错误的网关授权信息，uid必须大于0"); @@ -187,7 +187,7 @@ public class Router implements IRouter { IPacket responsePacket = clientSignalAttachment.getResponseFuture().get(DEFAULT_TIMEOUT, TimeUnit.MILLISECONDS); - if (responsePacket.protocolId() == Error.errorProtocolId()) { + if (responsePacket.getClass() == Error.class) { throw new ErrorResponseException((Error) responsePacket); } if (answerClass != null && answerClass != responsePacket.getClass()) { @@ -229,7 +229,7 @@ public class Router implements IRouter { throw new NetTimeOutException("async ask [{}] timeout exception", packet.getClass().getSimpleName()); } - if (answer.protocolId() == Error.errorProtocolId()) { + if (answer.getClass() == Error.class) { throw new ErrorResponseException((Error) answer); } diff --git a/net/src/main/java/com/zfoo/net/router/attachment/GatewayAttachment.java b/net/src/main/java/com/zfoo/net/router/attachment/GatewayAttachment.java index 3f28cb0d..9ac3bade 100644 --- a/net/src/main/java/com/zfoo/net/router/attachment/GatewayAttachment.java +++ b/net/src/main/java/com/zfoo/net/router/attachment/GatewayAttachment.java @@ -13,15 +13,15 @@ package com.zfoo.net.router.attachment; import com.zfoo.net.session.Session; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ +@Protocol(id = 2) public class GatewayAttachment implements IAttachment { - public static final short PROTOCOL_ID = 2; - /** * session id */ @@ -80,11 +80,6 @@ public class GatewayAttachment implements IAttachment { return useTaskExecutorHashParam ? taskExecutorHashParam : (int) uid; } - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public void wrapTaskExecutorHash(Object argument) { this.useTaskExecutorHashParam = true; this.taskExecutorHashParam = argument.hashCode(); diff --git a/net/src/main/java/com/zfoo/net/router/attachment/HttpAttachment.java b/net/src/main/java/com/zfoo/net/router/attachment/HttpAttachment.java index 8c00a97b..305fe48a 100644 --- a/net/src/main/java/com/zfoo/net/router/attachment/HttpAttachment.java +++ b/net/src/main/java/com/zfoo/net/router/attachment/HttpAttachment.java @@ -12,6 +12,7 @@ package com.zfoo.net.router.attachment; +import com.zfoo.protocol.anno.Protocol; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; @@ -19,10 +20,9 @@ import io.netty.handler.codec.http.HttpResponseStatus; * @author godotg * @version 3.0 */ +@Protocol(id = 4) public class HttpAttachment implements IAttachment { - public static final short PROTOCOL_ID = 4; - private long uid; private boolean useTaskExecutorHashParam; @@ -53,11 +53,6 @@ public class HttpAttachment implements IAttachment { return useTaskExecutorHashParam ? taskExecutorHashParam : (int) uid; } - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public void wrapTaskExecutorHash(Object argument) { this.useTaskExecutorHashParam = true; this.taskExecutorHashParam = argument.hashCode(); diff --git a/net/src/main/java/com/zfoo/net/router/attachment/NoAnswerAttachment.java b/net/src/main/java/com/zfoo/net/router/attachment/NoAnswerAttachment.java index a3116934..79032d5f 100644 --- a/net/src/main/java/com/zfoo/net/router/attachment/NoAnswerAttachment.java +++ b/net/src/main/java/com/zfoo/net/router/attachment/NoAnswerAttachment.java @@ -12,16 +12,16 @@ package com.zfoo.net.router.attachment; +import com.zfoo.protocol.anno.Protocol; + /** * not used attachment * * @author godotg * @version 3.0 */ +@Protocol(id = 5) public class NoAnswerAttachment implements IAttachment { - - public static final short PROTOCOL_ID = 5; - private int taskExecutorHash; public static NoAnswerAttachment valueOf(int taskExecutorHash) { @@ -35,11 +35,6 @@ public class NoAnswerAttachment implements IAttachment { return AttachmentType.NO_ANSWER_PACKET; } - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public int getTaskExecutorHash() { return taskExecutorHash; } diff --git a/net/src/main/java/com/zfoo/net/router/attachment/SignalAttachment.java b/net/src/main/java/com/zfoo/net/router/attachment/SignalAttachment.java index 4214ee4e..12d792b1 100644 --- a/net/src/main/java/com/zfoo/net/router/attachment/SignalAttachment.java +++ b/net/src/main/java/com/zfoo/net/router/attachment/SignalAttachment.java @@ -14,6 +14,7 @@ package com.zfoo.net.router.attachment; import com.fasterxml.jackson.annotation.JsonIgnore; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; import com.zfoo.scheduler.util.TimeUtils; import java.util.concurrent.CompletableFuture; @@ -23,10 +24,9 @@ import java.util.concurrent.atomic.AtomicInteger; * @author godotg * @version 3.0 */ +@Protocol(id = 0) public class SignalAttachment implements IAttachment { - public static final short PROTOCOL_ID = 0; - /** * EN:Negative signalId are allowed * CN:允许负数的signalId @@ -87,11 +87,6 @@ public class SignalAttachment implements IAttachment { this.timestamp = timestamp; } - @Override - public short protocolId() { - return PROTOCOL_ID; - } - @Override public boolean equals(Object o) { diff --git a/net/src/main/java/com/zfoo/net/router/attachment/SignalOnlyAttachment.java b/net/src/main/java/com/zfoo/net/router/attachment/SignalOnlyAttachment.java index c1d9d277..8843e2f5 100644 --- a/net/src/main/java/com/zfoo/net/router/attachment/SignalOnlyAttachment.java +++ b/net/src/main/java/com/zfoo/net/router/attachment/SignalOnlyAttachment.java @@ -12,16 +12,17 @@ package com.zfoo.net.router.attachment; +import com.zfoo.protocol.anno.Protocol; + /** * 主要用来支持godot，unity，ts这种异步语法的使用，做为async/await语法的支撑 * * @author godotg * @version 3.0 */ +@Protocol(id = 1) public class SignalOnlyAttachment implements IAttachment { - public static final short PROTOCOL_ID = 1; - private int signalId; private long timestamp; @@ -31,11 +32,6 @@ public class SignalOnlyAttachment implements IAttachment { return AttachmentType.SIGNAL_ONLY_PACKET; } - @Override - public short protocolId() { - return PROTOCOL_ID; - } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/net/src/main/java/com/zfoo/net/router/attachment/UdpAttachment.java b/net/src/main/java/com/zfoo/net/router/attachment/UdpAttachment.java index ed23725f..46952b23 100644 --- a/net/src/main/java/com/zfoo/net/router/attachment/UdpAttachment.java +++ b/net/src/main/java/com/zfoo/net/router/attachment/UdpAttachment.java @@ -12,14 +12,15 @@ package com.zfoo.net.router.attachment; +import com.zfoo.protocol.anno.Protocol; + /** * @author godotg * @version 3.0 */ +@Protocol(id = 3) public class UdpAttachment implements IAttachment { - public static final short PROTOCOL_ID = 3; - private String host; private int port; @@ -35,11 +36,6 @@ public class UdpAttachment implements IAttachment { return AttachmentType.UDP_PACKET; } - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public String getHost() { return host; } diff --git a/net/src/test/java/com/zfoo/net/packet/CM_Array.java b/net/src/test/java/com/zfoo/net/packet/CM_Array.java index 1d143b12..5cd02665 100644 --- a/net/src/test/java/com/zfoo/net/packet/CM_Array.java +++ b/net/src/test/java/com/zfoo/net/packet/CM_Array.java @@ -14,6 +14,7 @@ package com.zfoo.net.packet; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; import java.util.Arrays; @@ -21,10 +22,9 @@ import java.util.Arrays; * @author godotg * @version 3.0 */ +@Protocol(id = 1119) public class CM_Array implements IPacket { - public static final short PROTOCOL_ID = 1119; - private int[] a; private ObjectA[] b; @@ -51,11 +51,6 @@ public class CM_Array implements IPacket { this.b = b; } - @Override - public short protocolId() { - return PROTOCOL_ID; - } - @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/net/src/test/java/com/zfoo/net/packet/CM_Float.java b/net/src/test/java/com/zfoo/net/packet/CM_Float.java index eeba0106..dec29314 100644 --- a/net/src/test/java/com/zfoo/net/packet/CM_Float.java +++ b/net/src/test/java/com/zfoo/net/packet/CM_Float.java @@ -14,6 +14,7 @@ package com.zfoo.net.packet; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; import java.util.Objects; @@ -21,10 +22,9 @@ import java.util.Objects; * @author godotg * @version 3.0 */ +@Protocol(id = 1112) public class CM_Float implements IPacket { - public static final short PROTOCOL_ID = 1112; - private float a; private Float b; @@ -70,11 +70,6 @@ public class CM_Float implements IPacket { this.d = d; } - @Override - public short protocolId() { - return PROTOCOL_ID; - } - @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/net/src/test/java/com/zfoo/net/packet/CM_Int.java b/net/src/test/java/com/zfoo/net/packet/CM_Int.java index 4296da30..c929b3a1 100644 --- a/net/src/test/java/com/zfoo/net/packet/CM_Int.java +++ b/net/src/test/java/com/zfoo/net/packet/CM_Int.java @@ -14,6 +14,7 @@ package com.zfoo.net.packet; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; import java.util.Objects; @@ -21,10 +22,9 @@ import java.util.Objects; * @author godotg * @version 3.0 */ +@Protocol(id = 1110) public class CM_Int implements IPacket { - public static final short PROTOCOL_ID = 1110; - private boolean flag; private byte a; @@ -95,11 +95,6 @@ public class CM_Int implements IPacket { this.d = d; } - @Override - public short protocolId() { - return PROTOCOL_ID; - } - @Override public boolean equals(Object o) { diff --git a/net/src/test/java/com/zfoo/net/packet/CM_List.java b/net/src/test/java/com/zfoo/net/packet/CM_List.java index c465ba46..62b19d92 100644 --- a/net/src/test/java/com/zfoo/net/packet/CM_List.java +++ b/net/src/test/java/com/zfoo/net/packet/CM_List.java @@ -14,6 +14,7 @@ package com.zfoo.net.packet; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; import java.util.List; import java.util.Map; @@ -23,10 +24,9 @@ import java.util.Objects; * @author godotg * @version 3.0 */ +@Protocol(id = 1118, enhance = false) public class CM_List implements IPacket { - public static final short PROTOCOL_ID = 1118; - private List list; private List> listWitList; @@ -56,15 +56,6 @@ public class CM_List implements IPacket { this.list = list; } - public static short getProtocolId() { - return PROTOCOL_ID; - } - - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public List> getListWitList() { return listWitList; } diff --git a/net/src/test/java/com/zfoo/net/packet/CM_Map.java b/net/src/test/java/com/zfoo/net/packet/CM_Map.java index 9f8e4de7..294b6257 100644 --- a/net/src/test/java/com/zfoo/net/packet/CM_Map.java +++ b/net/src/test/java/com/zfoo/net/packet/CM_Map.java @@ -14,6 +14,7 @@ package com.zfoo.net.packet; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; import java.util.List; import java.util.Map; @@ -23,10 +24,9 @@ import java.util.Objects; * @author godotg * @version 3.0 */ +@Protocol(id = 1120, enhance = false) public class CM_Map implements IPacket { - public static final short PROTOCOL_ID = 1120; - private Map map; private Map mapA; @@ -37,10 +37,6 @@ public class CM_Map implements IPacket { private Map, Map, ObjectA>> mapWithListAndMap; - public static short getProtocolId() { - return PROTOCOL_ID; - } - public Map getMap() { return map; } @@ -49,11 +45,6 @@ public class CM_Map implements IPacket { this.map = map; } - @Override - public short protocolId() { - return PROTOCOL_ID; - } - @Override public String toString() { return "CM_Map{" + "map=" + map + ", mapA=" + mapA + ", mapB=" + mapB + ", mapC=" + mapC + '}'; diff --git a/net/src/test/java/com/zfoo/net/packet/CM_Object.java b/net/src/test/java/com/zfoo/net/packet/CM_Object.java index 562515f8..ff529df7 100644 --- a/net/src/test/java/com/zfoo/net/packet/CM_Object.java +++ b/net/src/test/java/com/zfoo/net/packet/CM_Object.java @@ -14,6 +14,7 @@ package com.zfoo.net.packet; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; import java.util.Objects; @@ -21,10 +22,9 @@ import java.util.Objects; * @author godotg * @version 3.0 */ +@Protocol(id = 1114) public class CM_Object implements IPacket { - public static final short PROTOCOL_ID = 1114; - private int a; private ObjectA b; @@ -50,11 +50,6 @@ public class CM_Object implements IPacket { this.b = b; } - @Override - public short protocolId() { - return PROTOCOL_ID; - } - @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/net/src/test/java/com/zfoo/net/packet/CM_Set.java b/net/src/test/java/com/zfoo/net/packet/CM_Set.java index 54055270..b0c6eaa0 100644 --- a/net/src/test/java/com/zfoo/net/packet/CM_Set.java +++ b/net/src/test/java/com/zfoo/net/packet/CM_Set.java @@ -14,6 +14,7 @@ package com.zfoo.net.packet; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; import java.util.List; import java.util.Map; @@ -24,10 +25,9 @@ import java.util.Set; * @author godotg * @version 3.0 */ +@Protocol(id = 1121, enhance = false) public class CM_Set implements IPacket { - public static final short PROTOCOL_ID = 1121; - private Set a; private Set b; private Set> c; @@ -36,11 +36,6 @@ public class CM_Set implements IPacket { private Set> setWithMap; private Set>> setListWithMap; - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public Set getA() { return a; } diff --git a/net/src/test/java/com/zfoo/net/packet/ObjectA.java b/net/src/test/java/com/zfoo/net/packet/ObjectA.java index 704ce1df..136c1b72 100644 --- a/net/src/test/java/com/zfoo/net/packet/ObjectA.java +++ b/net/src/test/java/com/zfoo/net/packet/ObjectA.java @@ -14,6 +14,7 @@ package com.zfoo.net.packet; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; import java.util.Objects; @@ -21,20 +22,14 @@ import java.util.Objects; * @author godotg * @version 3.0 */ +@Protocol(id = 1116) public class ObjectA implements IPacket { - public static final short PROTOCOL_ID = 1116; - private int a; private ObjectB objectB; - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public int getA() { return a; } diff --git a/net/src/test/java/com/zfoo/net/packet/ObjectB.java b/net/src/test/java/com/zfoo/net/packet/ObjectB.java index 0bee7007..59d9e9d8 100644 --- a/net/src/test/java/com/zfoo/net/packet/ObjectB.java +++ b/net/src/test/java/com/zfoo/net/packet/ObjectB.java @@ -14,6 +14,7 @@ package com.zfoo.net.packet; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; import java.util.Objects; @@ -21,17 +22,11 @@ import java.util.Objects; * @author godotg * @version 3.0 */ +@Protocol(id = 1117) public class ObjectB implements IPacket { - public static final short PROTOCOL_ID = 1117; - private boolean flag; - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public boolean isFlag() { return flag; } diff --git a/net/src/test/java/com/zfoo/net/packet/SM_Float.java b/net/src/test/java/com/zfoo/net/packet/SM_Float.java index 480c9978..82f53c9e 100644 --- a/net/src/test/java/com/zfoo/net/packet/SM_Float.java +++ b/net/src/test/java/com/zfoo/net/packet/SM_Float.java @@ -14,21 +14,14 @@ package com.zfoo.net.packet; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ +@Protocol(id = 1113) public class SM_Float implements IPacket { - public static final short PROTOCOL_ID = 1113; - - - @Override - public short protocolId() { - return PROTOCOL_ID; - } - - } diff --git a/net/src/test/java/com/zfoo/net/packet/SM_Int.java b/net/src/test/java/com/zfoo/net/packet/SM_Int.java index 63212598..0b6f1e35 100644 --- a/net/src/test/java/com/zfoo/net/packet/SM_Int.java +++ b/net/src/test/java/com/zfoo/net/packet/SM_Int.java @@ -14,6 +14,7 @@ package com.zfoo.net.packet; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; import java.util.Objects; @@ -21,10 +22,9 @@ import java.util.Objects; * @author godotg * @version 3.0 */ +@Protocol(id = 1111) public class SM_Int implements IPacket { - public static final short PROTOCOL_ID = 1111; - private Boolean flag; private Byte a; @@ -95,12 +95,6 @@ public class SM_Int implements IPacket { this.f = f; } - - @Override - public short protocolId() { - return PROTOCOL_ID; - } - @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/net/src/test/java/com/zfoo/net/packet/SM_Object.java b/net/src/test/java/com/zfoo/net/packet/SM_Object.java index 43e3af26..4af168f0 100644 --- a/net/src/test/java/com/zfoo/net/packet/SM_Object.java +++ b/net/src/test/java/com/zfoo/net/packet/SM_Object.java @@ -14,19 +14,14 @@ package com.zfoo.net.packet; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ +@Protocol(id = 1115) public class SM_Object implements IPacket { - public static final short PROTOCOL_ID = 1115; - - - @Override - public short protocolId() { - return PROTOCOL_ID; - } } diff --git a/net/src/test/java/com/zfoo/net/packet/csharp/CM_CSharpRequest.java b/net/src/test/java/com/zfoo/net/packet/csharp/CM_CSharpRequest.java index 0d7f0243..b5cb253a 100644 --- a/net/src/test/java/com/zfoo/net/packet/csharp/CM_CSharpRequest.java +++ b/net/src/test/java/com/zfoo/net/packet/csharp/CM_CSharpRequest.java @@ -14,6 +14,7 @@ package com.zfoo.net.packet.csharp; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; import java.util.List; import java.util.Map; @@ -23,10 +24,9 @@ import java.util.Set; * @author godotg * @version 3.0 */ +@Protocol(id = 1165) public class CM_CSharpRequest implements IPacket { - public static final short PROTOCOL_ID = 1165; - // 注释1 public byte a; /** @@ -100,9 +100,4 @@ public class CM_CSharpRequest implements IPacket { */ public Set> sssss; - @Override - public short protocolId() { - return PROTOCOL_ID; - } - } diff --git a/net/src/test/java/com/zfoo/net/packet/csharp/CSharpObjectA.java b/net/src/test/java/com/zfoo/net/packet/csharp/CSharpObjectA.java index c38dbe80..d5005895 100644 --- a/net/src/test/java/com/zfoo/net/packet/csharp/CSharpObjectA.java +++ b/net/src/test/java/com/zfoo/net/packet/csharp/CSharpObjectA.java @@ -14,20 +14,16 @@ package com.zfoo.net.packet.csharp; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ +@Protocol(id = 1166) public class CSharpObjectA implements IPacket { - public static final short PROTOCOL_ID = 1166; - public int value; public CSharpObjectB objectB; - @Override - public short protocolId() { - return PROTOCOL_ID; - } } diff --git a/net/src/test/java/com/zfoo/net/packet/csharp/CSharpObjectB.java b/net/src/test/java/com/zfoo/net/packet/csharp/CSharpObjectB.java index eee17da2..d5dbc572 100644 --- a/net/src/test/java/com/zfoo/net/packet/csharp/CSharpObjectB.java +++ b/net/src/test/java/com/zfoo/net/packet/csharp/CSharpObjectB.java @@ -14,19 +14,15 @@ package com.zfoo.net.packet.csharp; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ +@Protocol(id = 1167) public class CSharpObjectB implements IPacket { - public static final short PROTOCOL_ID = 1167; - public boolean flag; - @Override - public short protocolId() { - return PROTOCOL_ID; - } } diff --git a/net/src/test/java/com/zfoo/net/packet/gateway/GatewayToProviderRequest.java b/net/src/test/java/com/zfoo/net/packet/gateway/GatewayToProviderRequest.java index 6e5a12fa..9f25c2e7 100644 --- a/net/src/test/java/com/zfoo/net/packet/gateway/GatewayToProviderRequest.java +++ b/net/src/test/java/com/zfoo/net/packet/gateway/GatewayToProviderRequest.java @@ -14,22 +14,17 @@ package com.zfoo.net.packet.gateway; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ +@Protocol(id = 5000) public class GatewayToProviderRequest implements IPacket { - public static final short PROTOCOL_ID = 5000; - private String message; - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public String getMessage() { return message; } diff --git a/net/src/test/java/com/zfoo/net/packet/gateway/GatewayToProviderResponse.java b/net/src/test/java/com/zfoo/net/packet/gateway/GatewayToProviderResponse.java index bda4b4ff..f046d6d6 100644 --- a/net/src/test/java/com/zfoo/net/packet/gateway/GatewayToProviderResponse.java +++ b/net/src/test/java/com/zfoo/net/packet/gateway/GatewayToProviderResponse.java @@ -14,21 +14,17 @@ package com.zfoo.net.packet.gateway; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ +@Protocol(id = 5001) public class GatewayToProviderResponse implements IPacket { - public static final short PROTOCOL_ID = 5001; - private String message; - @Override - public short protocolId() { - return PROTOCOL_ID; - } public String getMessage() { return message; diff --git a/net/src/test/java/com/zfoo/net/packet/http/HttpHelloRequest.java b/net/src/test/java/com/zfoo/net/packet/http/HttpHelloRequest.java index 70f76ffb..f90598b9 100644 --- a/net/src/test/java/com/zfoo/net/packet/http/HttpHelloRequest.java +++ b/net/src/test/java/com/zfoo/net/packet/http/HttpHelloRequest.java @@ -13,15 +13,15 @@ package com.zfoo.net.packet.http; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ +@Protocol(id = 1700) public class HttpHelloRequest implements IPacket { - public static final short PROTOCOL_ID = 1700; - private String message; public static HttpHelloRequest valueOf(String message) { @@ -30,11 +30,6 @@ public class HttpHelloRequest implements IPacket { return request; } - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public String getMessage() { return message; } diff --git a/net/src/test/java/com/zfoo/net/packet/http/HttpHelloResponse.java b/net/src/test/java/com/zfoo/net/packet/http/HttpHelloResponse.java index 621f3182..936f40f6 100644 --- a/net/src/test/java/com/zfoo/net/packet/http/HttpHelloResponse.java +++ b/net/src/test/java/com/zfoo/net/packet/http/HttpHelloResponse.java @@ -13,23 +13,17 @@ package com.zfoo.net.packet.http; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ +@Protocol(id = 1701) public class HttpHelloResponse implements IPacket { - public static final short PROTOCOL_ID = 1701; - private String message; - - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public String getMessage() { return message; } diff --git a/net/src/test/java/com/zfoo/net/packet/jprotobuf/JProtobufHelloRequest.java b/net/src/test/java/com/zfoo/net/packet/jprotobuf/JProtobufHelloRequest.java index 013d2b15..52e1ca70 100644 --- a/net/src/test/java/com/zfoo/net/packet/jprotobuf/JProtobufHelloRequest.java +++ b/net/src/test/java/com/zfoo/net/packet/jprotobuf/JProtobufHelloRequest.java @@ -14,15 +14,15 @@ package com.zfoo.net.packet.jprotobuf; import com.baidu.bjf.remoting.protobuf.annotation.Protobuf; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ +@Protocol(id = 1500) public class JProtobufHelloRequest implements IPacket { - public static final short PROTOCOL_ID = 1500; - @Protobuf(order = 1) private String message; @@ -32,11 +32,6 @@ public class JProtobufHelloRequest implements IPacket { return request; } - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public String getMessage() { return message; } diff --git a/net/src/test/java/com/zfoo/net/packet/jprotobuf/JProtobufHelloResponse.java b/net/src/test/java/com/zfoo/net/packet/jprotobuf/JProtobufHelloResponse.java index e0ec69c7..1a2ca7e7 100644 --- a/net/src/test/java/com/zfoo/net/packet/jprotobuf/JProtobufHelloResponse.java +++ b/net/src/test/java/com/zfoo/net/packet/jprotobuf/JProtobufHelloResponse.java @@ -14,24 +14,18 @@ package com.zfoo.net.packet.jprotobuf; import com.baidu.bjf.remoting.protobuf.annotation.Protobuf; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ +@Protocol(id = 1501) public class JProtobufHelloResponse implements IPacket { - public static final short PROTOCOL_ID = 1501; - @Protobuf(order = 1) private String message; - - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public String getMessage() { return message; } diff --git a/net/src/test/java/com/zfoo/net/packet/json/JsonHelloRequest.java b/net/src/test/java/com/zfoo/net/packet/json/JsonHelloRequest.java index aaaa11c3..8a9fe95a 100644 --- a/net/src/test/java/com/zfoo/net/packet/json/JsonHelloRequest.java +++ b/net/src/test/java/com/zfoo/net/packet/json/JsonHelloRequest.java @@ -13,23 +13,17 @@ package com.zfoo.net.packet.json; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ +@Protocol(id = 1600) public class JsonHelloRequest implements IPacket { - public static final short PROTOCOL_ID = 1600; - private String message; - - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public String getMessage() { return message; } diff --git a/net/src/test/java/com/zfoo/net/packet/json/JsonHelloResponse.java b/net/src/test/java/com/zfoo/net/packet/json/JsonHelloResponse.java index 7fbb3320..991d07d1 100644 --- a/net/src/test/java/com/zfoo/net/packet/json/JsonHelloResponse.java +++ b/net/src/test/java/com/zfoo/net/packet/json/JsonHelloResponse.java @@ -13,21 +13,17 @@ package com.zfoo.net.packet.json; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ +@Protocol(id = 1601) public class JsonHelloResponse implements IPacket { - public static final short PROTOCOL_ID = 1601; - private String message; - @Override - public short protocolId() { - return PROTOCOL_ID; - } public String getMessage() { return message; diff --git a/net/src/test/java/com/zfoo/net/packet/provider/ProviderMessAnswer.java b/net/src/test/java/com/zfoo/net/packet/provider/ProviderMessAnswer.java index 2668327b..5bbe0011 100644 --- a/net/src/test/java/com/zfoo/net/packet/provider/ProviderMessAnswer.java +++ b/net/src/test/java/com/zfoo/net/packet/provider/ProviderMessAnswer.java @@ -14,22 +14,16 @@ package com.zfoo.net.packet.provider; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ +@Protocol(id = 4001) public class ProviderMessAnswer implements IPacket { - - public static final short PROTOCOL_ID = 4001; - private String message; - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public String getMessage() { return message; } diff --git a/net/src/test/java/com/zfoo/net/packet/provider/ProviderMessAsk.java b/net/src/test/java/com/zfoo/net/packet/provider/ProviderMessAsk.java index c01be349..259f395d 100644 --- a/net/src/test/java/com/zfoo/net/packet/provider/ProviderMessAsk.java +++ b/net/src/test/java/com/zfoo/net/packet/provider/ProviderMessAsk.java @@ -14,22 +14,17 @@ package com.zfoo.net.packet.provider; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ +@Protocol(id = 4000) public class ProviderMessAsk implements IPacket { - public static final short PROTOCOL_ID = 4000; - private String message; - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public String getMessage() { return message; } diff --git a/net/src/test/java/com/zfoo/net/packet/tcp/AsyncMessAnswer.java b/net/src/test/java/com/zfoo/net/packet/tcp/AsyncMessAnswer.java index 9c7d4136..ca8b6c5a 100644 --- a/net/src/test/java/com/zfoo/net/packet/tcp/AsyncMessAnswer.java +++ b/net/src/test/java/com/zfoo/net/packet/tcp/AsyncMessAnswer.java @@ -13,24 +13,18 @@ package com.zfoo.net.packet.tcp; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ +@Protocol(id = 1153) public class AsyncMessAnswer implements IPacket { - public static final short PROTOCOL_ID = 1153; - private String message; - @Override - public short protocolId() { - return PROTOCOL_ID; - } - - public String getMessage() { return message; } diff --git a/net/src/test/java/com/zfoo/net/packet/tcp/AsyncMessAsk.java b/net/src/test/java/com/zfoo/net/packet/tcp/AsyncMessAsk.java index 4eac087f..a99c9ada 100644 --- a/net/src/test/java/com/zfoo/net/packet/tcp/AsyncMessAsk.java +++ b/net/src/test/java/com/zfoo/net/packet/tcp/AsyncMessAsk.java @@ -13,21 +13,17 @@ package com.zfoo.net.packet.tcp; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ +@Protocol(id = 1152) public class AsyncMessAsk implements IPacket { - public static final short PROTOCOL_ID = 1152; - private String message; - @Override - public short protocolId() { - return PROTOCOL_ID; - } public String getMessage() { return message; diff --git a/net/src/test/java/com/zfoo/net/packet/tcp/SyncMessAnswer.java b/net/src/test/java/com/zfoo/net/packet/tcp/SyncMessAnswer.java index fec80ab3..456f7840 100644 --- a/net/src/test/java/com/zfoo/net/packet/tcp/SyncMessAnswer.java +++ b/net/src/test/java/com/zfoo/net/packet/tcp/SyncMessAnswer.java @@ -13,22 +13,17 @@ package com.zfoo.net.packet.tcp; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ +@Protocol(id = 1151) public class SyncMessAnswer implements IPacket { - public static final short PROTOCOL_ID = 1151; - private String message; - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public String getMessage() { return message; diff --git a/net/src/test/java/com/zfoo/net/packet/tcp/SyncMessAsk.java b/net/src/test/java/com/zfoo/net/packet/tcp/SyncMessAsk.java index a266db55..6df7a96b 100644 --- a/net/src/test/java/com/zfoo/net/packet/tcp/SyncMessAsk.java +++ b/net/src/test/java/com/zfoo/net/packet/tcp/SyncMessAsk.java @@ -13,22 +13,17 @@ package com.zfoo.net.packet.tcp; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ +@Protocol(id = 1150) public class SyncMessAsk implements IPacket { - public static final short PROTOCOL_ID = 1150; - private String message; - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public String getMessage() { return message; } diff --git a/net/src/test/java/com/zfoo/net/packet/tcp/TcpHelloRequest.java b/net/src/test/java/com/zfoo/net/packet/tcp/TcpHelloRequest.java index dcc4579d..fb64eb39 100644 --- a/net/src/test/java/com/zfoo/net/packet/tcp/TcpHelloRequest.java +++ b/net/src/test/java/com/zfoo/net/packet/tcp/TcpHelloRequest.java @@ -13,15 +13,14 @@ package com.zfoo.net.packet.tcp; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ +@Protocol(id = 1300) public class TcpHelloRequest implements IPacket { - - public static final short PROTOCOL_ID = 1300; - private String message; public static TcpHelloRequest valueOf(String message) { @@ -30,11 +29,6 @@ public class TcpHelloRequest implements IPacket { return request; } - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public String getMessage() { return message; } diff --git a/net/src/test/java/com/zfoo/net/packet/tcp/TcpHelloResponse.java b/net/src/test/java/com/zfoo/net/packet/tcp/TcpHelloResponse.java index 374c9832..03852a8a 100644 --- a/net/src/test/java/com/zfoo/net/packet/tcp/TcpHelloResponse.java +++ b/net/src/test/java/com/zfoo/net/packet/tcp/TcpHelloResponse.java @@ -13,23 +13,17 @@ package com.zfoo.net.packet.tcp; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ +@Protocol(id = 1301) public class TcpHelloResponse implements IPacket { - public static final short PROTOCOL_ID = 1301; - private String message; - - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public String getMessage() { return message; } diff --git a/net/src/test/java/com/zfoo/net/packet/udp/UdpHelloRequest.java b/net/src/test/java/com/zfoo/net/packet/udp/UdpHelloRequest.java index 21e6b196..121936c9 100644 --- a/net/src/test/java/com/zfoo/net/packet/udp/UdpHelloRequest.java +++ b/net/src/test/java/com/zfoo/net/packet/udp/UdpHelloRequest.java @@ -13,23 +13,16 @@ package com.zfoo.net.packet.udp; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ +@Protocol(id = 1200) public class UdpHelloRequest implements IPacket { - - public static final short PROTOCOL_ID = 1200; - private String message; - - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public String getMessage() { return message; } diff --git a/net/src/test/java/com/zfoo/net/packet/udp/UdpHelloResponse.java b/net/src/test/java/com/zfoo/net/packet/udp/UdpHelloResponse.java index 945e596c..1e2889af 100644 --- a/net/src/test/java/com/zfoo/net/packet/udp/UdpHelloResponse.java +++ b/net/src/test/java/com/zfoo/net/packet/udp/UdpHelloResponse.java @@ -13,23 +13,16 @@ package com.zfoo.net.packet.udp; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ +@Protocol(id = 1201) public class UdpHelloResponse implements IPacket { - - public static final short PROTOCOL_ID = 1201; - private String message; - - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public String getMessage() { return message; } diff --git a/net/src/test/java/com/zfoo/net/packet/websocket/WebSocketObjectA.java b/net/src/test/java/com/zfoo/net/packet/websocket/WebSocketObjectA.java index 1c5d7003..3bd97acc 100644 --- a/net/src/test/java/com/zfoo/net/packet/websocket/WebSocketObjectA.java +++ b/net/src/test/java/com/zfoo/net/packet/websocket/WebSocketObjectA.java @@ -14,6 +14,7 @@ package com.zfoo.net.packet.websocket; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; import java.util.Objects; @@ -21,10 +22,9 @@ import java.util.Objects; * @author godotg * @version 3.0 */ +@Protocol(id = 2071) public class WebSocketObjectA implements IPacket { - public static final short PROTOCOL_ID = 2071; - private int a; private WebSocketObjectB objectB; @@ -46,11 +46,6 @@ public class WebSocketObjectA implements IPacket { } - @Override - public short protocolId() { - return PROTOCOL_ID; - } - @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/net/src/test/java/com/zfoo/net/packet/websocket/WebSocketObjectB.java b/net/src/test/java/com/zfoo/net/packet/websocket/WebSocketObjectB.java index 65122a39..b2aa9e0d 100644 --- a/net/src/test/java/com/zfoo/net/packet/websocket/WebSocketObjectB.java +++ b/net/src/test/java/com/zfoo/net/packet/websocket/WebSocketObjectB.java @@ -14,6 +14,7 @@ package com.zfoo.net.packet.websocket; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; import java.util.Objects; @@ -21,10 +22,9 @@ import java.util.Objects; * @author godotg * @version 3.0 */ +@Protocol(id = 2072) public class WebSocketObjectB implements IPacket { - public static final short PROTOCOL_ID = 2072; - private boolean flag; @Override @@ -40,11 +40,6 @@ public class WebSocketObjectB implements IPacket { this.flag = flag; } - @Override - public short protocolId() { - return PROTOCOL_ID; - } - @Override public boolean equals(Object o) { diff --git a/net/src/test/java/com/zfoo/net/packet/websocket/WebSocketPacketRequest.java b/net/src/test/java/com/zfoo/net/packet/websocket/WebSocketPacketRequest.java index beac03c1..a56bba8c 100644 --- a/net/src/test/java/com/zfoo/net/packet/websocket/WebSocketPacketRequest.java +++ b/net/src/test/java/com/zfoo/net/packet/websocket/WebSocketPacketRequest.java @@ -14,6 +14,7 @@ package com.zfoo.net.packet.websocket; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; import java.util.List; import java.util.Map; @@ -23,10 +24,9 @@ import java.util.Set; * @author godotg * @version 3.0 */ +@Protocol(id = 2070) public class WebSocketPacketRequest implements IPacket { - public static final short PROTOCOL_ID = 2070; - private byte a; private Byte aa; private byte[] aaa; @@ -82,11 +82,6 @@ public class WebSocketPacketRequest implements IPacket { private Set ssss; private Set> sssss; - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public byte getA() { return a; } diff --git a/net/src/test/java/com/zfoo/net/packet/websocket/WebsocketHelloRequest.java b/net/src/test/java/com/zfoo/net/packet/websocket/WebsocketHelloRequest.java index 726405f1..cb27b01a 100644 --- a/net/src/test/java/com/zfoo/net/packet/websocket/WebsocketHelloRequest.java +++ b/net/src/test/java/com/zfoo/net/packet/websocket/WebsocketHelloRequest.java @@ -13,23 +13,18 @@ package com.zfoo.net.packet.websocket; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ +@Protocol(id = 1400) public class WebsocketHelloRequest implements IPacket { - public static final short PROTOCOL_ID = 1400; - private String message; - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public String getMessage() { return message; } diff --git a/net/src/test/java/com/zfoo/net/packet/websocket/WebsocketHelloResponse.java b/net/src/test/java/com/zfoo/net/packet/websocket/WebsocketHelloResponse.java index eb8fb489..511a7f2a 100644 --- a/net/src/test/java/com/zfoo/net/packet/websocket/WebsocketHelloResponse.java +++ b/net/src/test/java/com/zfoo/net/packet/websocket/WebsocketHelloResponse.java @@ -13,23 +13,16 @@ package com.zfoo.net.packet.websocket; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; /** * @author godotg * @version 3.0 */ +@Protocol(id = 1401) public class WebsocketHelloResponse implements IPacket { - - public static final short PROTOCOL_ID = 1401; - private String message; - - @Override - public short protocolId() { - return PROTOCOL_ID; - } - public String getMessage() { return message; } diff --git a/protocol/README.md b/protocol/README.md index ec337288..4c8f3b42 100644 --- a/protocol/README.md +++ b/protocol/README.md @@ -154,26 +154,8 @@ your protocol number a little more compactly, so that your protocol number will } ``` - - The second uses static constants + interfaces: the value of this protocol number must be the same as the value - returned by the IPacket interface, which can slightly improve performance - ``` - public class SimpleObject implements IPacket { - - public static final short PROTOCOL_ID = 104; - - public int c; - - public boolean g; - - @Override - public short protocolId() { - return PROTOCOL_ID; - } - - } - ``` - - The third use: Register the agreement through Protocol Manager.initProtocolAuto() without writing the protocol + - The second use: Register the agreement through Protocol Manager.initProtocolAuto() without writing the protocol number ``` public class SimpleObject implements IPacket { diff --git a/protocol/README_CN.md b/protocol/README_CN.md index 8c05666d..feeffbed 100644 --- a/protocol/README_CN.md +++ b/protocol/README_CN.md @@ -126,25 +126,7 @@ cpu： i9900k } ``` - - 第二种使用静态常量+接口：这个协议号的值必须和IPacket接口返回的值一样，这样的方式可以微弱的提升一点性能 - ``` - public class SimpleObject implements IPacket { - - public static final short PROTOCOL_ID = 104; - - public int c; - - public boolean g; - - @Override - public short protocolId() { - return PROTOCOL_ID; - } - - } - ``` - - - 第三种使用：通过ProtocolManager.initProtocolAuto()去注册协议就可以不写协议号 + - 第二种使用：通过ProtocolManager.initProtocolAuto()去注册协议就可以不写协议号 ``` public class SimpleObject implements IPacket { diff --git a/protocol/src/main/java/com/zfoo/protocol/IPacket.java b/protocol/src/main/java/com/zfoo/protocol/IPacket.java index b7e5284a..eb3ee290 100644 --- a/protocol/src/main/java/com/zfoo/protocol/IPacket.java +++ b/protocol/src/main/java/com/zfoo/protocol/IPacket.java @@ -29,8 +29,6 @@ public interface IPacket { /** * 这个类的协议号，重写这个方法，使用多态获取协议号，可以微弱的提高一点性能 *

- * 子类可以不用重写这个方法，也能够通过反射自动获取到PROTOCOL_ID这个协议号，序列化一次对象只会调用一次，性能损失很小 - * * @return 协议号Id */ default short protocolId() { diff --git a/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java b/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java index ac0e5811..0f3cc2ae 100644 --- a/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java +++ b/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java @@ -601,10 +601,10 @@ public class ProtocolAnalysis { // 必须要有一个空的构造器 Constructor constructor = ReflectionUtils.publicEmptyConstructor(clazz); - var protocolClass = clazz.getDeclaredAnnotation(Protocol.class); + var protocolAnnotation = clazz.getDeclaredAnnotation(Protocol.class); short protocolId = -1; - if (protocolClass != null && protocolClass.id() != 0) {// 注解标注的协议号 - protocolId = protocolClass.id(); + if (protocolAnnotation != null) { + protocolId = protocolAnnotation.id(); AssertionUtils.isTrue(protocolIdField == null && protocolMethod == null, "[class:{}]已经使用了注解标注协议号，不能再使用protocolId()方法和[{}]字段", clazz.getCanonicalName(), PROTOCOL_ID); } else if (protocolIdField != null || protocolMethod != null) { // 字段标注的协议号 AssertionUtils.isTrue(protocolIdField != null, "[class:{}]协议序列号[{}]不存在", clazz.getCanonicalName(), PROTOCOL_ID); diff --git a/protocol/src/test/java/com/zfoo/protocol/buffer/model/MyObjectA.java b/protocol/src/test/java/com/zfoo/protocol/buffer/model/MyObjectA.java index 32200b3d..bd66c0d1 100644 --- a/protocol/src/test/java/com/zfoo/protocol/buffer/model/MyObjectA.java +++ b/protocol/src/test/java/com/zfoo/protocol/buffer/model/MyObjectA.java @@ -14,6 +14,7 @@ package com.zfoo.protocol.buffer.model; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; import java.util.Map; import java.util.Objects; @@ -22,21 +23,15 @@ import java.util.Objects; * @author godotg * @version 3.0 */ +@Protocol(id = 2) public class MyObjectA implements IPacket { - public static final transient short PROTOCOL_ID = 2; - public int a; public Map b; public MyObjectB c; - @Override - public short protocolId() { - return PROTOCOL_ID; - } - @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/protocol/src/test/java/com/zfoo/protocol/buffer/model/MyObjectB.java b/protocol/src/test/java/com/zfoo/protocol/buffer/model/MyObjectB.java index 322f1d89..525ec13e 100644 --- a/protocol/src/test/java/com/zfoo/protocol/buffer/model/MyObjectB.java +++ b/protocol/src/test/java/com/zfoo/protocol/buffer/model/MyObjectB.java @@ -14,6 +14,7 @@ package com.zfoo.protocol.buffer.model; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; import java.util.Objects; @@ -21,17 +22,11 @@ import java.util.Objects; * @author godotg * @version 3.0 */ +@Protocol(id = 3) public class MyObjectB implements IPacket { - public static final transient short PROTOCOL_ID = 3; - public boolean a; - @Override - public short protocolId() { - return PROTOCOL_ID; - } - @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/protocol/src/test/java/com/zfoo/protocol/buffer/model/MyPacket.java b/protocol/src/test/java/com/zfoo/protocol/buffer/model/MyPacket.java deleted file mode 100644 index b14c9a62..00000000 --- a/protocol/src/test/java/com/zfoo/protocol/buffer/model/MyPacket.java +++ /dev/null @@ -1,156 +0,0 @@ -/* - * Copyright (C) 2020 The zfoo Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and limitations under the License. - */ - -package com.zfoo.protocol.buffer.model; - -import com.zfoo.protocol.IPacket; - -import java.util.List; -import java.util.Map; -import java.util.Set; - -/** - * @author godotg - * @version 3.0 - */ -public class MyPacket implements IPacket { - - public static final transient short PROTOCOL_ID = 1; - - // 基础类型 - public byte base1; - public short base2; - public int base3; - public long base4; - public float base5; - public double base6; - public boolean base7; - public char base8; - - // 包装类型 - public Byte box1; - public Short box2; - public Integer box3; - public Long box4; - public Float box5; - public Double box6; - public Boolean box7; - public Character box8; - - // string - public String str; - public MyObjectA objectA; - - // 数组 - public byte[] array1; - public Byte[] array2; - public short[] array3; - public Short[] array4; - public int[] array5; - public Integer[] array6; - public long[] array7; - public Long[] array8; - public float[] array9; - public Float[] array10; - public double[] array11; - public Double[] array12; - public boolean[] array13; - public Boolean[] array14; - public char[] array15; - public Character[] array16; - public String[] array17; - public MyObjectA[] array18; - - // list - public List list1; - public List list2; - public List list3; - public List list4; - public List list5; - public List list6; - public List list7; - public List list8; - public List list9; - public List list10; - - - // set - public Set set1; - public Set set2; - public Set set3; - public Set set4; - public Set set5; - public Set set6; - public Set set7; - public Set set8; - public Set set9; - public Set set10; - - - // map - public Map map1; - public Map map2; - public Map map3; - public Map map4; - public Map map5; - public Map map6; - public Map map7; - public Map map8; - public Map map9; - public Map map10; - public Map map11; - public Map map12; - public Map map15; - public Map map16; - public Map map17; - public Map map18; - public Map map19; - public Map map20; - public Map map21; - public Map> map22; - - // mix - public List> listList1; - public List> listList2; - public List> listSet1; - public List> listSet2; - public List> listMap1; - public List> listMap2; - public List>> listListSet; - public List>> listListMap; - - public Set> setList1; - public Set> setList2; - public Set> setSet1; - public Set> setSet2; - public Set> setMap1; - public Set> setMap2; - public Set>> setListSet; - public Set>> setListMap; - - public Map> mapList1; - public Map> mapList2; - public Map, Integer> mapSet1; - public Map, MyObjectA> mapSet2; - public Map> mapMap1; - public Map> mapMap2; - public Map>> mapListSet; - public Map>> mapListMap; - - @Override - public short protocolId() { - return PROTOCOL_ID; - } - - -} diff --git a/protocol/src/test/java/com/zfoo/protocol/collection/lpmap/model/MyPacket.java b/protocol/src/test/java/com/zfoo/protocol/collection/lpmap/model/MyPacket.java index b744848c..fa482c60 100644 --- a/protocol/src/test/java/com/zfoo/protocol/collection/lpmap/model/MyPacket.java +++ b/protocol/src/test/java/com/zfoo/protocol/collection/lpmap/model/MyPacket.java @@ -13,6 +13,7 @@ package com.zfoo.protocol.collection.lpmap.model; import com.zfoo.protocol.IPacket; +import com.zfoo.protocol.anno.Protocol; import java.util.Objects; @@ -20,10 +21,9 @@ import java.util.Objects; * @author godotg * @version 3.0 */ +@Protocol(id = 1) public class MyPacket implements IPacket { - public static final transient short PROTOCOL_ID = 1; - private int a; private String b; @@ -35,11 +35,6 @@ public class MyPacket implements IPacket { return packet; } - @Override - public short protocolId() { - return PROTOCOL_ID; - } - @Override public boolean equals(Object o) { if (this == o) return true;