From 9f7e9e0c3f83273b0f5fcb3cbd385d18835de0ba Mon Sep 17 00:00:00 2001 From: godotg Date: Sat, 9 Sep 2023 09:53:16 +0800 Subject: [PATCH] ref[net]: No need to inherit the IPacket interface anymore --- .../zfoo/net/core/gateway/GatewayServer.java | 5 ++- .../core/gateway/WebsocketGatewayServer.java | 5 ++- .../gateway/WebsocketSslGatewayServer.java | 5 ++- .../net/core/gateway/model/AuthUidAsk.java | 3 +- .../gateway/model/AuthUidToGatewayCheck.java | 3 +- .../model/AuthUidToGatewayConfirm.java | 3 +- .../model/GatewaySessionInactiveAsk.java | 3 +- .../model/GatewaySynchronizeSidAsk.java | 3 +- .../jprotobuf/JProtobufGatewayServer.java | 5 ++- .../zfoo/net/handler/GatewayRouteHandler.java | 10 +++--- .../handler/codec/http/HttpCodecHandler.java | 3 +- .../codec/json/JsonWebSocketCodecHandler.java | 5 ++- .../zfoo/net/packet/DecodedPacketInfo.java | 16 +++++----- .../com/zfoo/net/packet/PacketService.java | 5 ++- .../com/zfoo/net/packet/common/Error.java | 2 +- .../com/zfoo/net/packet/common/Heartbeat.java | 3 +- .../com/zfoo/net/packet/common/Message.java | 2 +- .../zfoo/net/packet/common/PairIntLong.java | 3 +- .../com/zfoo/net/packet/common/PairLS.java | 3 +- .../com/zfoo/net/packet/common/PairLong.java | 3 +- .../zfoo/net/packet/common/PairString.java | 3 +- .../java/com/zfoo/net/packet/common/Ping.java | 3 +- .../java/com/zfoo/net/packet/common/Pong.java | 3 +- .../com/zfoo/net/packet/common/TripleLLS.java | 3 +- .../com/zfoo/net/packet/common/TripleLSS.java | 3 +- .../zfoo/net/packet/common/TripleLong.java | 3 +- .../zfoo/net/packet/common/TripleString.java | 3 +- .../net/router/attachment/AttachmentType.java | 31 +++++++------------ .../router/attachment/GatewayAttachment.java | 24 +++++--------- .../net/router/attachment/HttpAttachment.java | 6 +--- .../net/router/attachment/IAttachment.java | 25 --------------- .../router/attachment/NoAnswerAttachment.java | 7 +---- .../router/attachment/SignalAttachment.java | 4 +-- .../attachment/SignalOnlyAttachment.java | 7 +---- .../net/router/attachment/UdpAttachment.java | 7 +---- .../net/router/receiver/EnhanceUtils.java | 8 ++--- .../com/zfoo/net/router/route/PacketBus.java | 7 ++--- .../java/com/zfoo/net/packet/CM_Array.java | 2 +- .../java/com/zfoo/net/packet/CM_Float.java | 2 +- .../test/java/com/zfoo/net/packet/CM_Int.java | 2 +- .../java/com/zfoo/net/packet/CM_List.java | 2 +- .../test/java/com/zfoo/net/packet/CM_Map.java | 2 +- .../java/com/zfoo/net/packet/CM_Object.java | 2 +- .../test/java/com/zfoo/net/packet/CM_Set.java | 2 +- .../java/com/zfoo/net/packet/ObjectA.java | 2 +- .../java/com/zfoo/net/packet/ObjectB.java | 2 +- .../java/com/zfoo/net/packet/SM_Float.java | 2 +- .../test/java/com/zfoo/net/packet/SM_Int.java | 2 +- .../java/com/zfoo/net/packet/SM_Object.java | 2 +- .../net/packet/csharp/CM_CSharpRequest.java | 3 +- .../zfoo/net/packet/csharp/CSharpObjectA.java | 3 +- .../zfoo/net/packet/csharp/CSharpObjectB.java | 3 +- .../gateway/GatewayToProviderRequest.java | 3 +- .../gateway/GatewayToProviderResponse.java | 3 +- .../net/packet/http/HttpHelloRequest.java | 3 +- .../net/packet/http/HttpHelloResponse.java | 3 +- .../jprotobuf/JProtobufHelloRequest.java | 3 +- .../jprotobuf/JProtobufHelloResponse.java | 3 +- .../net/packet/json/JsonHelloRequest.java | 3 +- .../net/packet/json/JsonHelloResponse.java | 3 +- .../packet/provider/ProviderMessAnswer.java | 3 +- .../net/packet/provider/ProviderMessAsk.java | 3 +- .../zfoo/net/packet/tcp/AsyncMessAnswer.java | 3 +- .../com/zfoo/net/packet/tcp/AsyncMessAsk.java | 3 +- .../zfoo/net/packet/tcp/SyncMessAnswer.java | 3 +- .../com/zfoo/net/packet/tcp/SyncMessAsk.java | 3 +- .../zfoo/net/packet/tcp/TcpHelloRequest.java | 3 +- .../zfoo/net/packet/tcp/TcpHelloResponse.java | 3 +- .../zfoo/net/packet/udp/UdpHelloRequest.java | 3 +- .../zfoo/net/packet/udp/UdpHelloResponse.java | 3 +- .../packet/websocket/WebSocketObjectA.java | 3 +- .../packet/websocket/WebSocketObjectB.java | 3 +- .../websocket/WebSocketPacketRequest.java | 3 +- .../websocket/WebsocketHelloRequest.java | 3 +- .../websocket/WebsocketHelloResponse.java | 3 +- 75 files changed, 109 insertions(+), 230 deletions(-) delete mode 100644 net/src/main/java/com/zfoo/net/router/attachment/IAttachment.java diff --git a/net/src/main/java/com/zfoo/net/core/gateway/GatewayServer.java b/net/src/main/java/com/zfoo/net/core/gateway/GatewayServer.java index 1c1eaed8..d26f9f73 100644 --- a/net/src/main/java/com/zfoo/net/core/gateway/GatewayServer.java +++ b/net/src/main/java/com/zfoo/net/core/gateway/GatewayServer.java @@ -18,7 +18,6 @@ import com.zfoo.net.core.HostAndPort; import com.zfoo.net.handler.GatewayRouteHandler; import com.zfoo.net.handler.codec.tcp.TcpCodecHandler; import com.zfoo.net.handler.idle.ServerIdleHandler; -import com.zfoo.net.packet.IPacket; import com.zfoo.net.session.Session; import io.netty.channel.socket.SocketChannel; import io.netty.handler.timeout.IdleStateHandler; @@ -32,9 +31,9 @@ import java.util.function.BiFunction; */ public class GatewayServer extends AbstractServer { - private BiFunction packetFilter; + private BiFunction packetFilter; - public GatewayServer(HostAndPort host, @Nullable BiFunction packetFilter) { + public GatewayServer(HostAndPort host, @Nullable BiFunction packetFilter) { super(host); this.packetFilter = packetFilter; } diff --git a/net/src/main/java/com/zfoo/net/core/gateway/WebsocketGatewayServer.java b/net/src/main/java/com/zfoo/net/core/gateway/WebsocketGatewayServer.java index 8ff8453d..8b70b4e1 100644 --- a/net/src/main/java/com/zfoo/net/core/gateway/WebsocketGatewayServer.java +++ b/net/src/main/java/com/zfoo/net/core/gateway/WebsocketGatewayServer.java @@ -18,7 +18,6 @@ import com.zfoo.net.core.HostAndPort; import com.zfoo.net.handler.GatewayRouteHandler; import com.zfoo.net.handler.codec.websocket.WebSocketCodecHandler; import com.zfoo.net.handler.idle.ServerIdleHandler; -import com.zfoo.net.packet.IPacket; import com.zfoo.net.session.Session; import com.zfoo.protocol.util.IOUtils; import io.netty.channel.socket.SocketChannel; @@ -37,9 +36,9 @@ import java.util.function.BiFunction; */ public class WebsocketGatewayServer extends AbstractServer { - private BiFunction packetFilter; + private BiFunction packetFilter; - public WebsocketGatewayServer(HostAndPort host, @Nullable BiFunction packetFilter) { + public WebsocketGatewayServer(HostAndPort host, @Nullable BiFunction packetFilter) { super(host); this.packetFilter = packetFilter; } diff --git a/net/src/main/java/com/zfoo/net/core/gateway/WebsocketSslGatewayServer.java b/net/src/main/java/com/zfoo/net/core/gateway/WebsocketSslGatewayServer.java index 6f3a52cb..87f8a14f 100644 --- a/net/src/main/java/com/zfoo/net/core/gateway/WebsocketSslGatewayServer.java +++ b/net/src/main/java/com/zfoo/net/core/gateway/WebsocketSslGatewayServer.java @@ -18,7 +18,6 @@ import com.zfoo.net.core.HostAndPort; import com.zfoo.net.handler.GatewayRouteHandler; import com.zfoo.net.handler.codec.websocket.WebSocketCodecHandler; import com.zfoo.net.handler.idle.ServerIdleHandler; -import com.zfoo.net.packet.IPacket; import com.zfoo.net.session.Session; import com.zfoo.protocol.util.IOUtils; import io.netty.channel.socket.SocketChannel; @@ -43,9 +42,9 @@ public class WebsocketSslGatewayServer extends AbstractServer { private SslContext sslContext; - private BiFunction packetFilter; + private BiFunction packetFilter; - public WebsocketSslGatewayServer(HostAndPort host, InputStream pem, InputStream key, @Nullable BiFunction packetFilter) { + public WebsocketSslGatewayServer(HostAndPort host, InputStream pem, InputStream key, @Nullable BiFunction packetFilter) { super(host); try { this.sslContext = SslContextBuilder.forServer(pem, key).build(); 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 6e4fc056..be190b99 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 @@ -13,7 +13,6 @@ package com.zfoo.net.core.gateway.model; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** @@ -21,7 +20,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 22) -public class AuthUidAsk implements IPacket { +public class AuthUidAsk { private String 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 838f8bb9..fbbd59d4 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 @@ -13,7 +13,6 @@ package com.zfoo.net.core.gateway.model; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** @@ -23,7 +22,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 20) -public class AuthUidToGatewayCheck implements IPacket { +public class AuthUidToGatewayCheck { private long 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 61ad1d05..f36bc0d1 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 @@ -13,7 +13,6 @@ package com.zfoo.net.core.gateway.model; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** @@ -23,7 +22,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 21) -public class AuthUidToGatewayConfirm implements IPacket { +public class AuthUidToGatewayConfirm { private long 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 33128aaf..7a98d53e 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 @@ -13,7 +13,6 @@ package com.zfoo.net.core.gateway.model; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** @@ -21,7 +20,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 23) -public class GatewaySessionInactiveAsk implements IPacket { +public class GatewaySessionInactiveAsk { private String 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 0b0c0f98..5d490da6 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 @@ -13,7 +13,6 @@ package com.zfoo.net.core.gateway.model; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; import java.util.Map; @@ -25,7 +24,7 @@ import java.util.Map; * @version 3.0 */ @Protocol(id = 24) -public class GatewaySynchronizeSidAsk implements IPacket { +public class GatewaySynchronizeSidAsk { private String gatewayHostAndPort; diff --git a/net/src/main/java/com/zfoo/net/core/jprotobuf/JProtobufGatewayServer.java b/net/src/main/java/com/zfoo/net/core/jprotobuf/JProtobufGatewayServer.java index 87eaa3f0..f52b8285 100644 --- a/net/src/main/java/com/zfoo/net/core/jprotobuf/JProtobufGatewayServer.java +++ b/net/src/main/java/com/zfoo/net/core/jprotobuf/JProtobufGatewayServer.java @@ -18,7 +18,6 @@ import com.zfoo.net.core.HostAndPort; import com.zfoo.net.handler.GatewayRouteHandler; import com.zfoo.net.handler.codec.jprotobuf.JProtobufTcpCodecHandler; import com.zfoo.net.handler.idle.ServerIdleHandler; -import com.zfoo.net.packet.IPacket; import com.zfoo.net.session.Session; import io.netty.channel.socket.SocketChannel; import io.netty.handler.timeout.IdleStateHandler; @@ -32,9 +31,9 @@ import java.util.function.BiFunction; */ public class JProtobufGatewayServer extends AbstractServer { - private final BiFunction packetFilter; + private final BiFunction packetFilter; - public JProtobufGatewayServer(HostAndPort host, @Nullable BiFunction packetFilter) { + public JProtobufGatewayServer(HostAndPort host, @Nullable BiFunction packetFilter) { super(host); this.packetFilter = packetFilter; } 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 b6e534b3..1980d375 100644 --- a/net/src/main/java/com/zfoo/net/handler/GatewayRouteHandler.java +++ b/net/src/main/java/com/zfoo/net/handler/GatewayRouteHandler.java @@ -19,12 +19,10 @@ import com.zfoo.net.consumer.balancer.ConsistentHashConsumerLoadBalancer; import com.zfoo.net.core.gateway.IGatewayLoadBalancer; import com.zfoo.net.core.gateway.model.GatewaySessionInactiveEvent; import com.zfoo.net.packet.DecodedPacketInfo; -import com.zfoo.net.packet.IPacket; import com.zfoo.net.packet.common.Heartbeat; 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.session.Session; import com.zfoo.net.util.SessionUtils; import com.zfoo.protocol.util.JsonUtils; @@ -48,11 +46,11 @@ public class GatewayRouteHandler extends ServerRouteHandler { private static final Logger logger = LoggerFactory.getLogger(GatewayRouteHandler.class); - public static final BiFunction DEFAULT_PACKER_FILTER = (session, packet) -> Boolean.FALSE; + public static final BiFunction DEFAULT_PACKER_FILTER = (session, packet) -> Boolean.FALSE; - private final BiFunction packetFilter; + private final BiFunction packetFilter; - public GatewayRouteHandler(@Nullable BiFunction packetFilter) { + public GatewayRouteHandler(@Nullable BiFunction packetFilter) { this.packetFilter = Objects.requireNonNullElse(packetFilter, DEFAULT_PACKER_FILTER); } @@ -110,7 +108,7 @@ public class GatewayRouteHandler extends ServerRouteHandler { /** * 转发网关收到的包到Provider */ - private void forwardingPacket(IPacket packet, IAttachment attachment, Object argument) { + private void forwardingPacket(Object packet, Object attachment, Object argument) { try { var consumerSession = ConsistentHashConsumerLoadBalancer.getInstance().loadBalancer(packet, argument); NetContext.getRouter().send(consumerSession, packet, attachment); 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 7c8d8d5d..df0405e5 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 @@ -14,7 +14,6 @@ package com.zfoo.net.handler.codec.http; import com.zfoo.net.packet.DecodedPacketInfo; import com.zfoo.net.packet.EncodedPacketInfo; -import com.zfoo.net.packet.IPacket; import com.zfoo.net.packet.common.Message; import com.zfoo.net.router.attachment.HttpAttachment; import com.zfoo.protocol.util.JsonUtils; @@ -48,7 +47,7 @@ public class HttpCodecHandler extends MessageToMessageCodec list) { - var packet = (IPacket) out.getPacket(); + var packet = out.getPacket(); var attachment = (HttpAttachment) out.getAttachment(); var protocolVersion = attachment.getFullHttpRequest().protocolVersion(); 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 54394a9f..4b614dc0 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 @@ -16,7 +16,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.net.router.attachment.IAttachment; import com.zfoo.protocol.ProtocolManager; import com.zfoo.protocol.buffer.ByteBufUtils; import com.zfoo.protocol.util.JsonUtils; @@ -43,12 +42,12 @@ public class JsonWebSocketCodecHandler extends MessageToMessageCodec= 0) { var attachmentClass = ProtocolManager.getProtocol(attachmentId).protocolConstructor().getDeclaringClass(); - attachment = (IAttachment) JsonUtils.string2Object(jsonMap.get("attachment"), attachmentClass); + attachment = JsonUtils.string2Object(jsonMap.get("attachment"), attachmentClass); } } diff --git a/net/src/main/java/com/zfoo/net/packet/DecodedPacketInfo.java b/net/src/main/java/com/zfoo/net/packet/DecodedPacketInfo.java index 97d85272..e5bc644a 100644 --- a/net/src/main/java/com/zfoo/net/packet/DecodedPacketInfo.java +++ b/net/src/main/java/com/zfoo/net/packet/DecodedPacketInfo.java @@ -12,7 +12,6 @@ package com.zfoo.net.packet; -import com.zfoo.net.router.attachment.IAttachment; /** * @author godotg @@ -23,15 +22,15 @@ public class DecodedPacketInfo { /** * 解码后的包 */ - private IPacket packet; + private Object packet; /** * 解码后的包的附加包 */ - private IAttachment attachment; + private Object attachment; - public static DecodedPacketInfo valueOf(IPacket packet, IAttachment attachment) { + public static DecodedPacketInfo valueOf(Object packet, Object attachment) { DecodedPacketInfo packetInfo = new DecodedPacketInfo(); packetInfo.packet = packet; packetInfo.attachment = attachment; @@ -39,20 +38,19 @@ public class DecodedPacketInfo { } - public IPacket getPacket() { + public Object getPacket() { return packet; } - public void setPacket(IPacket packet) { + public void setPacket(Object packet) { this.packet = packet; } - public IAttachment getAttachment() { + public Object getAttachment() { return attachment; } - public void setAttachment(IAttachment attachment) { + public void setAttachment(Object attachment) { this.attachment = attachment; } - } diff --git a/net/src/main/java/com/zfoo/net/packet/PacketService.java b/net/src/main/java/com/zfoo/net/packet/PacketService.java index 02a838f2..5cbc1cc4 100644 --- a/net/src/main/java/com/zfoo/net/packet/PacketService.java +++ b/net/src/main/java/com/zfoo/net/packet/PacketService.java @@ -13,7 +13,6 @@ package com.zfoo.net.packet; import com.zfoo.net.NetContext; -import com.zfoo.net.router.attachment.IAttachment; import com.zfoo.net.router.attachment.SignalOnlyAttachment; import com.zfoo.net.router.route.PacketBus; import com.zfoo.protocol.ProtocolManager; @@ -151,8 +150,8 @@ public class PacketService implements IPacketService { var packet = ProtocolManager.read(buffer); // 解析包的附加包 var hasAttachment = ByteBufUtils.tryReadBoolean(buffer); - var attachment = hasAttachment ? ((IAttachment) ProtocolManager.read(buffer)) : null; - return DecodedPacketInfo.valueOf((IPacket) packet, attachment); + var attachment = hasAttachment ? (ProtocolManager.read(buffer)) : null; + return 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 50ea7083..3a520806 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 @@ -27,7 +27,7 @@ import org.slf4j.helpers.MessageFormatter; */ @ProtobufClass @Protocol(id = 101) -public class Error implements IPacket { +public class Error { @Protobuf(order = 1) private int module; 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 6bb0fbe3..1fd11a3e 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 @@ -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.anno.Protocol; /** @@ -23,6 +22,6 @@ import com.zfoo.protocol.anno.Protocol; */ @ProtobufClass @Protocol(id = 102) -public class Heartbeat implements IPacket { +public class Heartbeat { } 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 07445355..00b6f9b7 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 @@ -26,7 +26,7 @@ import com.zfoo.protocol.anno.Protocol; */ @ProtobufClass @Protocol(id = 100) -public class Message implements IPacket { +public class Message { private byte 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 716a1d54..96a11c0e 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 @@ -15,7 +15,6 @@ package com.zfoo.net.packet.common; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; import java.util.Objects; @@ -25,7 +24,7 @@ import java.util.Objects; * @version 3.0 */ @Protocol(id = 110) -public class PairIntLong implements IPacket { +public class PairIntLong { @JsonSerialize(using = ToStringSerializer.class) private int key; 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 c8adb7d1..1b066285 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 @@ -15,7 +15,6 @@ package com.zfoo.net.packet.common; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** @@ -25,7 +24,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 113) -public class PairLS implements IPacket { +public class PairLS { @JsonSerialize(using = ToStringSerializer.class) private long 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 1f2cdb44..e03779f4 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 @@ -15,7 +15,6 @@ package com.zfoo.net.packet.common; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** @@ -23,7 +22,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 111) -public class PairLong implements IPacket { +public class PairLong { @JsonSerialize(using = ToStringSerializer.class) private long 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 09f2c334..cff3e0b9 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 @@ -13,7 +13,6 @@ package com.zfoo.net.packet.common; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** @@ -21,7 +20,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 112) -public class PairString implements IPacket { +public class PairString { private String 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 8d8b5df4..4cc545c0 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 @@ -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.anno.Protocol; /** @@ -23,6 +22,6 @@ import com.zfoo.protocol.anno.Protocol; */ @ProtobufClass @Protocol(id = 103) -public class Ping implements IPacket { +public class Ping { } 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 794fb012..5b73ae01 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 @@ -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.anno.Protocol; /** @@ -24,7 +23,7 @@ import com.zfoo.protocol.anno.Protocol; */ @ProtobufClass @Protocol(id = 104) -public class Pong implements IPacket { +public class Pong { /** * 服务器当前的时间戳 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 f7345c6e..d4f21744 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 @@ -15,7 +15,6 @@ package com.zfoo.net.packet.common; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** @@ -23,7 +22,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 117) -public class TripleLLS implements IPacket { +public class TripleLLS { @JsonSerialize(using = ToStringSerializer.class) private long 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 64727b39..6464299e 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 @@ -15,7 +15,6 @@ package com.zfoo.net.packet.common; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** @@ -25,7 +24,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 116) -public class TripleLSS implements IPacket { +public class TripleLSS { @JsonSerialize(using = ToStringSerializer.class) private long 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 d11a149a..24b24066 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 @@ -15,7 +15,6 @@ package com.zfoo.net.packet.common; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** @@ -23,7 +22,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 114) -public class TripleLong implements IPacket { +public class TripleLong { @JsonSerialize(using = ToStringSerializer.class) private long 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 95577a98..a2624cc7 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 @@ -13,7 +13,6 @@ package com.zfoo.net.packet.common; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** @@ -21,7 +20,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 115) -public class TripleString implements IPacket { +public class TripleString { private String left; private String middle; diff --git a/net/src/main/java/com/zfoo/net/router/attachment/AttachmentType.java b/net/src/main/java/com/zfoo/net/router/attachment/AttachmentType.java index 8deb3c5c..162d5d00 100644 --- a/net/src/main/java/com/zfoo/net/router/attachment/AttachmentType.java +++ b/net/src/main/java/com/zfoo/net/router/attachment/AttachmentType.java @@ -24,58 +24,51 @@ public enum AttachmentType { /** * synchronous or asynchronous attachment */ - SIGNAL_PACKET((byte) 0, SignalAttachment.class), + SIGNAL_PACKET(SignalAttachment.class), - SIGNAL_ONLY_PACKET((byte) 1, SignalOnlyAttachment.class), + SIGNAL_ONLY_PACKET(SignalOnlyAttachment.class), /** * gateway attachment */ - GATEWAY_PACKET((byte) 2, GatewayAttachment.class), + GATEWAY_PACKET(GatewayAttachment.class), /** * udp attachment */ - UDP_PACKET((byte) 3, UdpAttachment.class), + UDP_PACKET(UdpAttachment.class), /** * http attachment */ - HTTP_PACKET((byte) 4, HttpAttachment.class), + HTTP_PACKET(HttpAttachment.class), /** * not used attachment */ - NO_ANSWER_PACKET((byte) 5, NoAnswerAttachment.class), + NO_ANSWER_PACKET(NoAnswerAttachment.class), ; - public static final Map map = new HashMap<>(values().length); + public static final Map, AttachmentType> map = new HashMap<>(); static { for (var packetType : AttachmentType.values()) { - map.put(packetType.packetType, packetType); + map.put(packetType.clazz, packetType); } } - private final byte packetType; + private final Class clazz; - public byte getPacketType() { - return packetType; - } - - private final Class clazz; - - AttachmentType(byte packetType, Class clazz) { - this.packetType = packetType; + AttachmentType(Class clazz) { this.clazz = clazz; } - public static AttachmentType getPacketType(byte packetType) { - return map.getOrDefault(packetType, AttachmentType.NO_ANSWER_PACKET); + public static boolean isAttachmentClass(Class attachmentClass) { + return map.containsKey(attachmentClass); } } 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 9ac3bade..17d30c47 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 @@ -20,7 +20,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 2) -public class GatewayAttachment implements IAttachment { +public class GatewayAttachment { /** * session id @@ -67,11 +67,6 @@ public class GatewayAttachment implements IAttachment { } - @Override - public AttachmentType packetType() { - return AttachmentType.GATEWAY_PACKET; - } - /** * EN:Used to determine which thread the message is processed on * CN:用来确定这条消息在哪一个线程处理 @@ -85,22 +80,19 @@ public class GatewayAttachment implements IAttachment { this.taskExecutorHashParam = argument.hashCode(); } - public void wrapAttachment(IAttachment attachment) { + public void wrapAttachment(Object attachment) { if (attachment == null) { return; } - switch (attachment.packetType()) { - case SIGNAL_ONLY_PACKET: - signalOnlyAttachment = (SignalOnlyAttachment) attachment; - break; - case SIGNAL_PACKET: - signalAttachment = (SignalAttachment) attachment; - break; - default: + var attachmentClass = attachment.getClass(); + if (attachmentClass == SignalOnlyAttachment.class) { + signalOnlyAttachment = (SignalOnlyAttachment) attachment; + } else if (attachmentClass == SignalAttachment.class) { + signalAttachment = (SignalAttachment) attachment; } } - public IAttachment attachment() { + public Object attachment() { if (signalAttachment != null) { return signalAttachment; } 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 305fe48a..fda1f196 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 @@ -21,7 +21,7 @@ import io.netty.handler.codec.http.HttpResponseStatus; * @version 3.0 */ @Protocol(id = 4) -public class HttpAttachment implements IAttachment { +public class HttpAttachment { private long uid; @@ -40,10 +40,6 @@ public class HttpAttachment implements IAttachment { return attachment; } - @Override - public AttachmentType packetType() { - return AttachmentType.HTTP_PACKET; - } /** * EN:Used to determine which thread the message is processed on diff --git a/net/src/main/java/com/zfoo/net/router/attachment/IAttachment.java b/net/src/main/java/com/zfoo/net/router/attachment/IAttachment.java deleted file mode 100644 index 0708f3f3..00000000 --- a/net/src/main/java/com/zfoo/net/router/attachment/IAttachment.java +++ /dev/null @@ -1,25 +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.net.router.attachment; - -import com.zfoo.net.packet.IPacket; - -/** - * @author godotg - * @version 3.0 - */ -public interface IAttachment extends IPacket { - - AttachmentType packetType(); - -} 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 79032d5f..23698bec 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 @@ -21,7 +21,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 5) -public class NoAnswerAttachment implements IAttachment { +public class NoAnswerAttachment { private int taskExecutorHash; public static NoAnswerAttachment valueOf(int taskExecutorHash) { @@ -30,11 +30,6 @@ public class NoAnswerAttachment implements IAttachment { return attachment; } - @Override - public AttachmentType packetType() { - return AttachmentType.NO_ANSWER_PACKET; - } - 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 a44baeb0..6cc9b0dc 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 @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger; * @version 3.0 */ @Protocol(id = 0) -public class SignalAttachment implements IAttachment { +public class SignalAttachment { /** * EN:Negative signalId are allowed @@ -64,8 +64,6 @@ public class SignalAttachment implements IAttachment { public SignalAttachment() { } - - @Override public AttachmentType packetType() { return AttachmentType.SIGNAL_PACKET; } 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 8843e2f5..852be5ca 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 @@ -21,17 +21,12 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 1) -public class SignalOnlyAttachment implements IAttachment { +public class SignalOnlyAttachment { private int signalId; private long timestamp; - @Override - public AttachmentType packetType() { - return AttachmentType.SIGNAL_ONLY_PACKET; - } - @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 46952b23..8529cc75 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 @@ -19,7 +19,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 3) -public class UdpAttachment implements IAttachment { +public class UdpAttachment { private String host; private int port; @@ -31,11 +31,6 @@ public class UdpAttachment implements IAttachment { return attachment; } - @Override - public AttachmentType packetType() { - return AttachmentType.UDP_PACKET; - } - public String getHost() { return host; } diff --git a/net/src/main/java/com/zfoo/net/router/receiver/EnhanceUtils.java b/net/src/main/java/com/zfoo/net/router/receiver/EnhanceUtils.java index 3f422aaa..e4c69fc0 100644 --- a/net/src/main/java/com/zfoo/net/router/receiver/EnhanceUtils.java +++ b/net/src/main/java/com/zfoo/net/router/receiver/EnhanceUtils.java @@ -13,8 +13,6 @@ package com.zfoo.net.router.receiver; -import com.zfoo.net.packet.IPacket; -import com.zfoo.net.router.attachment.IAttachment; import com.zfoo.net.session.Session; import com.zfoo.protocol.util.StringUtils; import com.zfoo.protocol.util.UuidUtils; @@ -31,8 +29,6 @@ public abstract class EnhanceUtils { static { var classArray = new Class[]{ - IPacket.class, - IAttachment.class, IPacketReceiver.class, Session.class }; @@ -54,7 +50,7 @@ public abstract class EnhanceUtils { var packetClazz = definition.getPacketClazz(); var attachmentClazz = definition.getAttachmentClazz(); - var enhanceClazz = classPool.makeClass(EnhanceUtils.class.getCanonicalName() + "Dispatcher" + UuidUtils.getLocalIntId()); + var enhanceClazz = classPool.makeClass(EnhanceUtils.class.getCanonicalName() + "Route" + UuidUtils.getLocalIntId()); enhanceClazz.addInterface(classPool.get(IPacketReceiver.class.getCanonicalName())); var field = new CtField(classPool.get(bean.getClass().getCanonicalName()), "bean", enhanceClazz); @@ -66,7 +62,7 @@ public abstract class EnhanceUtils { constructor.setModifiers(Modifier.PUBLIC); enhanceClazz.addConstructor(constructor); - var invokeMethod = new CtMethod(classPool.get(void.class.getCanonicalName()), "invoke", classPool.get(new String[]{Session.class.getCanonicalName(), IPacket.class.getCanonicalName(), IAttachment.class.getCanonicalName()}), enhanceClazz); + var invokeMethod = new CtMethod(classPool.get(void.class.getCanonicalName()), "invoke", classPool.get(new String[]{Session.class.getCanonicalName(), Object.class.getCanonicalName(), Object.class.getCanonicalName()}), enhanceClazz); invokeMethod.setModifiers(Modifier.PUBLIC + Modifier.FINAL); if (attachmentClazz == null) { // Cast type(强制类型转换) diff --git a/net/src/main/java/com/zfoo/net/router/route/PacketBus.java b/net/src/main/java/com/zfoo/net/router/route/PacketBus.java index e1163b11..af921a87 100644 --- a/net/src/main/java/com/zfoo/net/router/route/PacketBus.java +++ b/net/src/main/java/com/zfoo/net/router/route/PacketBus.java @@ -14,10 +14,9 @@ package com.zfoo.net.router.route; import com.zfoo.net.anno.PacketReceiver; -import com.zfoo.net.packet.IPacket; import com.zfoo.net.packet.PacketService; +import com.zfoo.net.router.attachment.AttachmentType; 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.router.receiver.EnhanceUtils; import com.zfoo.net.router.receiver.IPacketReceiver; @@ -81,9 +80,7 @@ public abstract class PacketBus { AssertionUtils.isTrue(Session.class.isAssignableFrom(paramClazzs[0]), "[class:{}] [method:{}],the first parameter must be Session type parameter Exception.", bean.getClass().getName(), method.getName()); - AssertionUtils.isTrue(IPacket.class.isAssignableFrom(paramClazzs[1]), "[class:{}] [method:{}],the second parameter must be IPacket type parameter Exception.", bean.getClass().getName(), method.getName()); - - AssertionUtils.isTrue(paramClazzs.length != 3 || IAttachment.class.isAssignableFrom(paramClazzs[2]), "[class:{}] [method:{}],the third parameter must be IAttachment type parameter Exception.", bean.getClass().getName(), method.getName()); + AssertionUtils.isTrue(paramClazzs.length != 3 || AttachmentType.isAttachmentClass(paramClazzs[2]), "[class:{}] [method:{}],the third parameter must be Attachment type parameter Exception.", bean.getClass().getName(), method.getName()); var packetClazz = paramClazzs[1]; var attachmentClazz = paramClazzs.length == 3 ? paramClazzs[2] : null; 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 6ec44582..fb126264 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 @@ -22,7 +22,7 @@ import java.util.Arrays; * @version 3.0 */ @Protocol(id = 1119) -public class CM_Array implements IPacket { +public class CM_Array { private int[] a; 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 a5e4cd49..dc11f9f2 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 @@ -22,7 +22,7 @@ import java.util.Objects; * @version 3.0 */ @Protocol(id = 1112) -public class CM_Float implements IPacket { +public class CM_Float { private float a; 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 de5069a2..80f72e80 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 @@ -22,7 +22,7 @@ import java.util.Objects; * @version 3.0 */ @Protocol(id = 1110) -public class CM_Int implements IPacket { +public class CM_Int { private boolean flag; 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 6f07231f..ec6e4d05 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 @@ -24,7 +24,7 @@ import java.util.Objects; * @version 3.0 */ @Protocol(id = 1118, enhance = false) -public class CM_List implements IPacket { +public class CM_List { private List list; 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 db3ee495..96259ae1 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 @@ -24,7 +24,7 @@ import java.util.Objects; * @version 3.0 */ @Protocol(id = 1120, enhance = false) -public class CM_Map implements IPacket { +public class CM_Map { private Map map; 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 b5af54f8..18c352f1 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 @@ -22,7 +22,7 @@ import java.util.Objects; * @version 3.0 */ @Protocol(id = 1114) -public class CM_Object implements IPacket { +public class CM_Object { private int a; 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 835d33c9..74040cb5 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 @@ -25,7 +25,7 @@ import java.util.Set; * @version 3.0 */ @Protocol(id = 1121, enhance = false) -public class CM_Set implements IPacket { +public class CM_Set { private Set a; private Set b; 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 858c7574..9184ca17 100644 --- a/net/src/test/java/com/zfoo/net/packet/ObjectA.java +++ b/net/src/test/java/com/zfoo/net/packet/ObjectA.java @@ -22,7 +22,7 @@ import java.util.Objects; * @version 3.0 */ @Protocol(id = 1116) -public class ObjectA implements IPacket { +public class ObjectA { private int 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 9c96a405..cdf526f7 100644 --- a/net/src/test/java/com/zfoo/net/packet/ObjectB.java +++ b/net/src/test/java/com/zfoo/net/packet/ObjectB.java @@ -22,7 +22,7 @@ import java.util.Objects; * @version 3.0 */ @Protocol(id = 1117) -public class ObjectB implements IPacket { +public class ObjectB { private boolean 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 9319d66d..20323af6 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 @@ -20,7 +20,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 1113) -public class SM_Float implements IPacket { +public class SM_Float { } 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 e1592c81..2719c7c5 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 @@ -22,7 +22,7 @@ import java.util.Objects; * @version 3.0 */ @Protocol(id = 1111) -public class SM_Int implements IPacket { +public class SM_Int { private Boolean flag; 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 f5561e67..af338b7c 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 @@ -20,7 +20,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 1115) -public class SM_Object implements IPacket { +public class SM_Object { } 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 9dfe0282..06e4eb92 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 @@ -13,7 +13,6 @@ package com.zfoo.net.packet.csharp; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; import java.util.List; @@ -25,7 +24,7 @@ import java.util.Set; * @version 3.0 */ @Protocol(id = 1165) -public class CM_CSharpRequest implements IPacket { +public class CM_CSharpRequest { // 注释1 public byte a; 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 6b186e04..90461007 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 @@ -13,7 +13,6 @@ package com.zfoo.net.packet.csharp; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** @@ -21,7 +20,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 1166) -public class CSharpObjectA implements IPacket { +public class CSharpObjectA { public int value; public CSharpObjectB objectB; 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 fd05dc6c..7bf8ecc2 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 @@ -13,7 +13,6 @@ package com.zfoo.net.packet.csharp; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** @@ -21,7 +20,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 1167) -public class CSharpObjectB implements IPacket { +public class CSharpObjectB { public boolean flag; 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 3141d4e8..d9340b8d 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 @@ -13,7 +13,6 @@ package com.zfoo.net.packet.gateway; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** @@ -21,7 +20,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 5000) -public class GatewayToProviderRequest implements IPacket { +public class GatewayToProviderRequest { private String 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 ae7300c2..cf917e8e 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 @@ -13,7 +13,6 @@ package com.zfoo.net.packet.gateway; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** @@ -21,7 +20,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 5001) -public class GatewayToProviderResponse implements IPacket { +public class GatewayToProviderResponse { private String 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 04ccc7d1..3d51ccd6 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 @@ -12,7 +12,6 @@ package com.zfoo.net.packet.http; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** @@ -20,7 +19,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 1700) -public class HttpHelloRequest implements IPacket { +public class HttpHelloRequest { private String 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 d01de1c4..ea8925e3 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 @@ -12,7 +12,6 @@ package com.zfoo.net.packet.http; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** @@ -20,7 +19,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 1701) -public class HttpHelloResponse implements IPacket { +public class HttpHelloResponse { private String 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 a68d95c6..20a96ddd 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 @@ -13,7 +13,6 @@ package com.zfoo.net.packet.jprotobuf; import com.baidu.bjf.remoting.protobuf.annotation.Protobuf; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** @@ -21,7 +20,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 1500) -public class JProtobufHelloRequest implements IPacket { +public class JProtobufHelloRequest { @Protobuf(order = 1) private String 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 4c6f3590..2c02182d 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 @@ -13,7 +13,6 @@ package com.zfoo.net.packet.jprotobuf; import com.baidu.bjf.remoting.protobuf.annotation.Protobuf; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** @@ -21,7 +20,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 1501) -public class JProtobufHelloResponse implements IPacket { +public class JProtobufHelloResponse { @Protobuf(order = 1) private String 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 75e3dee0..1db4de68 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 @@ -12,7 +12,6 @@ package com.zfoo.net.packet.json; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** @@ -20,7 +19,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 1600) -public class JsonHelloRequest implements IPacket { +public class JsonHelloRequest { private String 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 adae168c..d9d9b6ea 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 @@ -12,7 +12,6 @@ package com.zfoo.net.packet.json; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** @@ -20,7 +19,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 1601) -public class JsonHelloResponse implements IPacket { +public class JsonHelloResponse { private String 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 b3aa873e..969340a1 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 @@ -13,7 +13,6 @@ package com.zfoo.net.packet.provider; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** @@ -21,7 +20,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 4001) -public class ProviderMessAnswer implements IPacket { +public class ProviderMessAnswer { private String message; public String getMessage() { 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 46a03caf..23842747 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 @@ -13,7 +13,6 @@ package com.zfoo.net.packet.provider; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** @@ -21,7 +20,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 4000) -public class ProviderMessAsk implements IPacket { +public class ProviderMessAsk { private String 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 4ae7d2f8..4573e785 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 @@ -12,7 +12,6 @@ package com.zfoo.net.packet.tcp; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** @@ -20,7 +19,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 1153) -public class AsyncMessAnswer implements IPacket { +public class AsyncMessAnswer { private String 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 20d39ca6..ea18560d 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 @@ -12,7 +12,6 @@ package com.zfoo.net.packet.tcp; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** @@ -20,7 +19,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 1152) -public class AsyncMessAsk implements IPacket { +public class AsyncMessAsk { private String 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 a2427315..2ca251c9 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 @@ -12,7 +12,6 @@ package com.zfoo.net.packet.tcp; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** @@ -20,7 +19,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 1151) -public class SyncMessAnswer implements IPacket { +public class SyncMessAnswer { private String 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 f7580be4..201b880e 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 @@ -12,7 +12,6 @@ package com.zfoo.net.packet.tcp; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** @@ -20,7 +19,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 1150) -public class SyncMessAsk implements IPacket { +public class SyncMessAsk { private String 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 b957e40d..48493656 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 @@ -12,7 +12,6 @@ package com.zfoo.net.packet.tcp; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** @@ -20,7 +19,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 1300) -public class TcpHelloRequest implements IPacket { +public class TcpHelloRequest { private String message; public static TcpHelloRequest valueOf(String 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 7f7f31f1..9ecb746d 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 @@ -12,7 +12,6 @@ package com.zfoo.net.packet.tcp; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** @@ -20,7 +19,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 1301) -public class TcpHelloResponse implements IPacket { +public class TcpHelloResponse { private String 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 a285472f..a18a53f5 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 @@ -12,7 +12,6 @@ package com.zfoo.net.packet.udp; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** @@ -20,7 +19,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 1200) -public class UdpHelloRequest implements IPacket { +public class UdpHelloRequest { private String message; public String getMessage() { 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 a5981e6f..9d4fe336 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 @@ -12,7 +12,6 @@ package com.zfoo.net.packet.udp; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** @@ -20,7 +19,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 1201) -public class UdpHelloResponse implements IPacket { +public class UdpHelloResponse { private String message; public String getMessage() { 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 b91428a5..763e9a3d 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 @@ -13,7 +13,6 @@ package com.zfoo.net.packet.websocket; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; import java.util.Objects; @@ -23,7 +22,7 @@ import java.util.Objects; * @version 3.0 */ @Protocol(id = 2071) -public class WebSocketObjectA implements IPacket { +public class WebSocketObjectA { private int a; 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 04fe4f21..cdd85f31 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 @@ -13,7 +13,6 @@ package com.zfoo.net.packet.websocket; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; import java.util.Objects; @@ -23,7 +22,7 @@ import java.util.Objects; * @version 3.0 */ @Protocol(id = 2072) -public class WebSocketObjectB implements IPacket { +public class WebSocketObjectB { private boolean flag; 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 4225bb30..98fd402e 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 @@ -13,7 +13,6 @@ package com.zfoo.net.packet.websocket; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; import java.util.List; @@ -25,7 +24,7 @@ import java.util.Set; * @version 3.0 */ @Protocol(id = 2070) -public class WebSocketPacketRequest implements IPacket { +public class WebSocketPacketRequest { private byte a; private Byte aa; 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 fbcbc97c..6b3293fa 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 @@ -12,7 +12,6 @@ package com.zfoo.net.packet.websocket; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** @@ -20,7 +19,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 1400) -public class WebsocketHelloRequest implements IPacket { +public class WebsocketHelloRequest { private String 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 977b2a2a..af39b0ba 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 @@ -12,7 +12,6 @@ package com.zfoo.net.packet.websocket; -import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** @@ -20,7 +19,7 @@ import com.zfoo.protocol.anno.Protocol; * @version 3.0 */ @Protocol(id = 1401) -public class WebsocketHelloResponse implements IPacket { +public class WebsocketHelloResponse { private String message; public String getMessage() {