From cbc2f1e90031c8dcc24f499e0738519f977a930e Mon Sep 17 00:00:00 2001 From: godotg Date: Sun, 3 Sep 2023 16:01:46 +0800 Subject: [PATCH] ref[packet]: move IPacket from protocol to net --- net/src/main/java/com/zfoo/net/consumer/Consumer.java | 2 +- net/src/main/java/com/zfoo/net/consumer/IConsumer.java | 2 +- .../consumer/balancer/AbstractConsumerLoadBalancer.java | 2 +- .../balancer/ConsistentHashConsumerLoadBalancer.java | 2 +- .../zfoo/net/consumer/balancer/IConsumerLoadBalancer.java | 2 +- .../net/consumer/balancer/RandomConsumerLoadBalancer.java | 2 +- .../java/com/zfoo/net/core/event/ServerExceptionEvent.java | 2 +- .../main/java/com/zfoo/net/core/gateway/GatewayServer.java | 2 +- .../com/zfoo/net/core/gateway/WebsocketGatewayServer.java | 2 +- .../zfoo/net/core/gateway/WebsocketSslGatewayServer.java | 2 +- .../java/com/zfoo/net/core/gateway/model/AuthUidAsk.java | 2 +- .../zfoo/net/core/gateway/model/AuthUidToGatewayCheck.java | 2 +- .../net/core/gateway/model/AuthUidToGatewayConfirm.java | 2 +- .../net/core/gateway/model/GatewaySessionInactiveAsk.java | 2 +- .../net/core/gateway/model/GatewaySynchronizeSidAsk.java | 2 +- .../zfoo/net/core/jprotobuf/JProtobufGatewayServer.java | 2 +- .../java/com/zfoo/net/handler/GatewayRouteHandler.java | 2 +- .../com/zfoo/net/handler/codec/http/HttpCodecHandler.java | 2 +- .../handler/codec/jprotobuf/JProtobufTcpCodecHandler.java | 2 +- .../java/com/zfoo/net/handler/codec/json/JsonPacket.java | 2 +- .../net/handler/codec/json/JsonWebSocketCodecHandler.java | 2 +- .../main/java/com/zfoo/net/packet/DecodedPacketInfo.java | 1 - .../main/java/com/zfoo/net/packet/EncodedPacketInfo.java | 1 - .../src/main/java/com/zfoo/net/packet}/IPacket.java | 5 +++-- net/src/main/java/com/zfoo/net/packet/IPacketService.java | 1 - net/src/main/java/com/zfoo/net/packet/PacketService.java | 1 - net/src/main/java/com/zfoo/net/packet/common/Error.java | 2 +- .../main/java/com/zfoo/net/packet/common/Heartbeat.java | 2 +- net/src/main/java/com/zfoo/net/packet/common/Message.java | 2 +- .../main/java/com/zfoo/net/packet/common/PairIntLong.java | 2 +- net/src/main/java/com/zfoo/net/packet/common/PairLS.java | 2 +- net/src/main/java/com/zfoo/net/packet/common/PairLong.java | 2 +- .../main/java/com/zfoo/net/packet/common/PairString.java | 2 +- net/src/main/java/com/zfoo/net/packet/common/Ping.java | 2 +- net/src/main/java/com/zfoo/net/packet/common/Pong.java | 2 +- .../main/java/com/zfoo/net/packet/common/TripleLLS.java | 2 +- .../main/java/com/zfoo/net/packet/common/TripleLSS.java | 2 +- .../main/java/com/zfoo/net/packet/common/TripleLong.java | 2 +- .../main/java/com/zfoo/net/packet/common/TripleString.java | 2 +- net/src/main/java/com/zfoo/net/router/IRouter.java | 2 +- net/src/main/java/com/zfoo/net/router/Router.java | 2 +- .../main/java/com/zfoo/net/router/answer/AsyncAnswer.java | 2 +- .../main/java/com/zfoo/net/router/answer/IAsyncAnswer.java | 2 +- .../main/java/com/zfoo/net/router/answer/ISyncAnswer.java | 2 +- .../main/java/com/zfoo/net/router/answer/SyncAnswer.java | 2 +- .../java/com/zfoo/net/router/attachment/IAttachment.java | 2 +- .../com/zfoo/net/router/attachment/SignalAttachment.java | 2 +- .../java/com/zfoo/net/router/receiver/EnhanceUtils.java | 2 +- .../java/com/zfoo/net/router/receiver/IPacketReceiver.java | 2 +- .../zfoo/net/router/receiver/PacketReceiverDefinition.java | 2 +- net/src/main/java/com/zfoo/net/router/route/PacketBus.java | 2 +- .../main/java/com/zfoo/net/task/PacketReceiverTask.java | 2 +- net/src/test/java/com/zfoo/net/packet/CM_Array.java | 1 - net/src/test/java/com/zfoo/net/packet/CM_Float.java | 1 - net/src/test/java/com/zfoo/net/packet/CM_Int.java | 1 - net/src/test/java/com/zfoo/net/packet/CM_List.java | 1 - net/src/test/java/com/zfoo/net/packet/CM_Map.java | 1 - net/src/test/java/com/zfoo/net/packet/CM_Object.java | 1 - net/src/test/java/com/zfoo/net/packet/CM_Set.java | 1 - net/src/test/java/com/zfoo/net/packet/ObjectA.java | 1 - net/src/test/java/com/zfoo/net/packet/ObjectB.java | 1 - net/src/test/java/com/zfoo/net/packet/SM_Float.java | 1 - net/src/test/java/com/zfoo/net/packet/SM_Int.java | 1 - net/src/test/java/com/zfoo/net/packet/SM_Object.java | 1 - .../java/com/zfoo/net/packet/csharp/CM_CSharpRequest.java | 2 +- .../java/com/zfoo/net/packet/csharp/CSharpObjectA.java | 2 +- .../java/com/zfoo/net/packet/csharp/CSharpObjectB.java | 2 +- .../zfoo/net/packet/gateway/GatewayToProviderRequest.java | 2 +- .../zfoo/net/packet/gateway/GatewayToProviderResponse.java | 2 +- .../java/com/zfoo/net/packet/http/HttpHelloRequest.java | 2 +- .../java/com/zfoo/net/packet/http/HttpHelloResponse.java | 2 +- .../zfoo/net/packet/jprotobuf/JProtobufHelloRequest.java | 2 +- .../zfoo/net/packet/jprotobuf/JProtobufHelloResponse.java | 2 +- .../java/com/zfoo/net/packet/json/JsonHelloRequest.java | 2 +- .../java/com/zfoo/net/packet/json/JsonHelloResponse.java | 2 +- .../com/zfoo/net/packet/provider/ProviderMessAnswer.java | 2 +- .../java/com/zfoo/net/packet/provider/ProviderMessAsk.java | 2 +- .../test/java/com/zfoo/net/packet/tcp/AsyncMessAnswer.java | 2 +- .../test/java/com/zfoo/net/packet/tcp/AsyncMessAsk.java | 2 +- .../test/java/com/zfoo/net/packet/tcp/SyncMessAnswer.java | 2 +- net/src/test/java/com/zfoo/net/packet/tcp/SyncMessAsk.java | 2 +- .../test/java/com/zfoo/net/packet/tcp/TcpHelloRequest.java | 2 +- .../java/com/zfoo/net/packet/tcp/TcpHelloResponse.java | 2 +- .../test/java/com/zfoo/net/packet/udp/UdpHelloRequest.java | 2 +- .../java/com/zfoo/net/packet/udp/UdpHelloResponse.java | 2 +- .../com/zfoo/net/packet/websocket/WebSocketObjectA.java | 2 +- .../com/zfoo/net/packet/websocket/WebSocketObjectB.java | 2 +- .../zfoo/net/packet/websocket/WebSocketPacketRequest.java | 2 +- .../zfoo/net/packet/websocket/WebsocketHelloRequest.java | 2 +- .../zfoo/net/packet/websocket/WebsocketHelloResponse.java | 2 +- .../com/zfoo/protocol/registration/ProtocolAnalysis.java | 1 - .../java/com/zfoo/storage/export/ExportBinaryTest.java | 7 +++---- 92 files changed, 79 insertions(+), 96 deletions(-) rename {protocol/src/main/java/com/zfoo/protocol => net/src/main/java/com/zfoo/net/packet}/IPacket.java (95%) 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 912dbf3b..02b4fdc8 100644 --- a/net/src/main/java/com/zfoo/net/consumer/Consumer.java +++ b/net/src/main/java/com/zfoo/net/consumer/Consumer.java @@ -16,6 +16,7 @@ package com.zfoo.net.consumer; import com.zfoo.net.NetContext; import com.zfoo.net.consumer.balancer.AbstractConsumerLoadBalancer; import com.zfoo.net.consumer.balancer.IConsumerLoadBalancer; +import com.zfoo.net.packet.IPacket; import com.zfoo.net.packet.common.Error; import com.zfoo.net.router.Router; import com.zfoo.net.router.answer.AsyncAnswer; @@ -27,7 +28,6 @@ import com.zfoo.net.router.exception.NetTimeOutException; import com.zfoo.net.router.exception.UnexpectedProtocolException; import com.zfoo.net.router.route.SignalBridge; import com.zfoo.net.task.TaskBus; -import com.zfoo.protocol.IPacket; import com.zfoo.protocol.ProtocolManager; import com.zfoo.protocol.collection.CollectionUtils; import com.zfoo.protocol.registration.ProtocolModule; diff --git a/net/src/main/java/com/zfoo/net/consumer/IConsumer.java b/net/src/main/java/com/zfoo/net/consumer/IConsumer.java index 3f9a45bb..ce1ae1e0 100644 --- a/net/src/main/java/com/zfoo/net/consumer/IConsumer.java +++ b/net/src/main/java/com/zfoo/net/consumer/IConsumer.java @@ -14,9 +14,9 @@ package com.zfoo.net.consumer; import com.zfoo.net.consumer.balancer.IConsumerLoadBalancer; +import com.zfoo.net.packet.IPacket; import com.zfoo.net.router.answer.AsyncAnswer; import com.zfoo.net.router.answer.SyncAnswer; -import com.zfoo.protocol.IPacket; import com.zfoo.protocol.registration.ProtocolModule; import org.springframework.lang.Nullable; diff --git a/net/src/main/java/com/zfoo/net/consumer/balancer/AbstractConsumerLoadBalancer.java b/net/src/main/java/com/zfoo/net/consumer/balancer/AbstractConsumerLoadBalancer.java index ba19d257..64c1d14b 100644 --- a/net/src/main/java/com/zfoo/net/consumer/balancer/AbstractConsumerLoadBalancer.java +++ b/net/src/main/java/com/zfoo/net/consumer/balancer/AbstractConsumerLoadBalancer.java @@ -15,8 +15,8 @@ package com.zfoo.net.consumer.balancer; import com.zfoo.net.NetContext; import com.zfoo.net.consumer.registry.RegisterVO; +import com.zfoo.net.packet.IPacket; import com.zfoo.net.session.Session; -import com.zfoo.protocol.IPacket; import com.zfoo.protocol.ProtocolManager; import com.zfoo.protocol.registration.ProtocolModule; import com.zfoo.protocol.util.StringUtils; diff --git a/net/src/main/java/com/zfoo/net/consumer/balancer/ConsistentHashConsumerLoadBalancer.java b/net/src/main/java/com/zfoo/net/consumer/balancer/ConsistentHashConsumerLoadBalancer.java index 09b237a5..62b2e01b 100644 --- a/net/src/main/java/com/zfoo/net/consumer/balancer/ConsistentHashConsumerLoadBalancer.java +++ b/net/src/main/java/com/zfoo/net/consumer/balancer/ConsistentHashConsumerLoadBalancer.java @@ -14,10 +14,10 @@ package com.zfoo.net.consumer.balancer; import com.zfoo.net.NetContext; +import com.zfoo.net.packet.IPacket; import com.zfoo.net.session.Session; import com.zfoo.net.util.ConsistentHash; import com.zfoo.net.util.FastTreeMapIntLong; -import com.zfoo.protocol.IPacket; import com.zfoo.protocol.ProtocolManager; import com.zfoo.protocol.collection.CollectionUtils; import com.zfoo.protocol.exception.RunException; diff --git a/net/src/main/java/com/zfoo/net/consumer/balancer/IConsumerLoadBalancer.java b/net/src/main/java/com/zfoo/net/consumer/balancer/IConsumerLoadBalancer.java index 8ee530c0..e331a151 100644 --- a/net/src/main/java/com/zfoo/net/consumer/balancer/IConsumerLoadBalancer.java +++ b/net/src/main/java/com/zfoo/net/consumer/balancer/IConsumerLoadBalancer.java @@ -13,9 +13,9 @@ package com.zfoo.net.consumer.balancer; +import com.zfoo.net.packet.IPacket; import com.zfoo.net.router.attachment.SignalAttachment; import com.zfoo.net.session.Session; -import com.zfoo.protocol.IPacket; import org.springframework.lang.Nullable; /** diff --git a/net/src/main/java/com/zfoo/net/consumer/balancer/RandomConsumerLoadBalancer.java b/net/src/main/java/com/zfoo/net/consumer/balancer/RandomConsumerLoadBalancer.java index 113a554d..86c13935 100644 --- a/net/src/main/java/com/zfoo/net/consumer/balancer/RandomConsumerLoadBalancer.java +++ b/net/src/main/java/com/zfoo/net/consumer/balancer/RandomConsumerLoadBalancer.java @@ -13,8 +13,8 @@ package com.zfoo.net.consumer.balancer; +import com.zfoo.net.packet.IPacket; import com.zfoo.net.session.Session; -import com.zfoo.protocol.IPacket; import com.zfoo.protocol.ProtocolManager; import com.zfoo.protocol.exception.RunException; import com.zfoo.protocol.util.RandomUtils; diff --git a/net/src/main/java/com/zfoo/net/core/event/ServerExceptionEvent.java b/net/src/main/java/com/zfoo/net/core/event/ServerExceptionEvent.java index 0f8cf049..5f3f3ed8 100644 --- a/net/src/main/java/com/zfoo/net/core/event/ServerExceptionEvent.java +++ b/net/src/main/java/com/zfoo/net/core/event/ServerExceptionEvent.java @@ -13,9 +13,9 @@ package com.zfoo.net.core.event; import com.zfoo.event.model.IEvent; +import com.zfoo.net.packet.IPacket; import com.zfoo.net.router.attachment.IAttachment; import com.zfoo.net.session.Session; -import com.zfoo.protocol.IPacket; /** * @author meiw 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 9d15c93b..1c1eaed8 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,8 +18,8 @@ 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 com.zfoo.protocol.IPacket; import io.netty.channel.socket.SocketChannel; import io.netty.handler.timeout.IdleStateHandler; import org.springframework.lang.Nullable; 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 e36d1720..8ff8453d 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,8 +18,8 @@ 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.IPacket; import com.zfoo.protocol.util.IOUtils; import io.netty.channel.socket.SocketChannel; import io.netty.handler.codec.http.HttpObjectAggregator; 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 89f8c456..6f3a52cb 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,8 +18,8 @@ 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.IPacket; import com.zfoo.protocol.util.IOUtils; import io.netty.channel.socket.SocketChannel; import io.netty.handler.codec.http.HttpObjectAggregator; 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 aab8fc2f..6e4fc056 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,7 @@ package com.zfoo.net.core.gateway.model; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 3c9956c1..838f8bb9 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,7 @@ package com.zfoo.net.core.gateway.model; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 058e1834..61ad1d05 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,7 @@ package com.zfoo.net.core.gateway.model; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 52eb7ec0..33128aaf 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,7 @@ package com.zfoo.net.core.gateway.model; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 4c87614b..0b0c0f98 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,7 @@ package com.zfoo.net.core.gateway.model; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; import java.util.Map; 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 1ec931ea..87eaa3f0 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,8 +18,8 @@ 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 com.zfoo.protocol.IPacket; import io.netty.channel.socket.SocketChannel; import io.netty.handler.timeout.IdleStateHandler; import org.springframework.lang.Nullable; 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 df0deb68..b6e534b3 100644 --- a/net/src/main/java/com/zfoo/net/handler/GatewayRouteHandler.java +++ b/net/src/main/java/com/zfoo/net/handler/GatewayRouteHandler.java @@ -19,6 +19,7 @@ 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; @@ -26,7 +27,6 @@ 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.IPacket; import com.zfoo.protocol.util.JsonUtils; import com.zfoo.protocol.util.StringUtils; import com.zfoo.scheduler.util.TimeUtils; 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 632c575c..7c8d8d5d 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,9 +14,9 @@ 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.IPacket; import com.zfoo.protocol.util.JsonUtils; import com.zfoo.protocol.util.StringUtils; import io.netty.channel.ChannelHandlerContext; diff --git a/net/src/main/java/com/zfoo/net/handler/codec/jprotobuf/JProtobufTcpCodecHandler.java b/net/src/main/java/com/zfoo/net/handler/codec/jprotobuf/JProtobufTcpCodecHandler.java index c1f75bdb..3de9ea32 100644 --- a/net/src/main/java/com/zfoo/net/handler/codec/jprotobuf/JProtobufTcpCodecHandler.java +++ b/net/src/main/java/com/zfoo/net/handler/codec/jprotobuf/JProtobufTcpCodecHandler.java @@ -17,9 +17,9 @@ import com.baidu.bjf.remoting.protobuf.Codec; import com.baidu.bjf.remoting.protobuf.ProtobufProxy; import com.zfoo.net.packet.DecodedPacketInfo; import com.zfoo.net.packet.EncodedPacketInfo; +import com.zfoo.net.packet.IPacket; import com.zfoo.net.packet.PacketService; import com.zfoo.net.router.attachment.IAttachment; -import com.zfoo.protocol.IPacket; import com.zfoo.protocol.ProtocolManager; import com.zfoo.protocol.buffer.ByteBufUtils; import com.zfoo.protocol.util.IOUtils; diff --git a/net/src/main/java/com/zfoo/net/handler/codec/json/JsonPacket.java b/net/src/main/java/com/zfoo/net/handler/codec/json/JsonPacket.java index 202ed623..60801c26 100644 --- a/net/src/main/java/com/zfoo/net/handler/codec/json/JsonPacket.java +++ b/net/src/main/java/com/zfoo/net/handler/codec/json/JsonPacket.java @@ -13,8 +13,8 @@ package com.zfoo.net.handler.codec.json; +import com.zfoo.net.packet.IPacket; import com.zfoo.net.router.attachment.IAttachment; -import com.zfoo.protocol.IPacket; /** * @author godotg 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 e0c24a9e..54394a9f 100644 --- a/net/src/main/java/com/zfoo/net/handler/codec/json/JsonWebSocketCodecHandler.java +++ b/net/src/main/java/com/zfoo/net/handler/codec/json/JsonWebSocketCodecHandler.java @@ -15,8 +15,8 @@ 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.IPacket; import com.zfoo.protocol.ProtocolManager; import com.zfoo.protocol.buffer.ByteBufUtils; import com.zfoo.protocol.util.JsonUtils; 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 a0f03288..97d85272 100644 --- a/net/src/main/java/com/zfoo/net/packet/DecodedPacketInfo.java +++ b/net/src/main/java/com/zfoo/net/packet/DecodedPacketInfo.java @@ -13,7 +13,6 @@ package com.zfoo.net.packet; import com.zfoo.net.router.attachment.IAttachment; -import com.zfoo.protocol.IPacket; /** * @author godotg diff --git a/net/src/main/java/com/zfoo/net/packet/EncodedPacketInfo.java b/net/src/main/java/com/zfoo/net/packet/EncodedPacketInfo.java index edff34e8..81b217b8 100644 --- a/net/src/main/java/com/zfoo/net/packet/EncodedPacketInfo.java +++ b/net/src/main/java/com/zfoo/net/packet/EncodedPacketInfo.java @@ -13,7 +13,6 @@ package com.zfoo.net.packet; import com.zfoo.net.router.attachment.IAttachment; -import com.zfoo.protocol.IPacket; import org.springframework.lang.Nullable; /** diff --git a/protocol/src/main/java/com/zfoo/protocol/IPacket.java b/net/src/main/java/com/zfoo/net/packet/IPacket.java similarity index 95% rename from protocol/src/main/java/com/zfoo/protocol/IPacket.java rename to net/src/main/java/com/zfoo/net/packet/IPacket.java index eb3ee290..e7aa5d94 100644 --- a/protocol/src/main/java/com/zfoo/protocol/IPacket.java +++ b/net/src/main/java/com/zfoo/net/packet/IPacket.java @@ -1,6 +1,5 @@ /* * 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 * @@ -11,7 +10,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.protocol; +package com.zfoo.net.packet; + +import com.zfoo.protocol.ProtocolManager; /** * 所有协议类都必须实现这个接口，协议类必须是简单的javabean，不能继承任何其它的类，但是可以继承接口 diff --git a/net/src/main/java/com/zfoo/net/packet/IPacketService.java b/net/src/main/java/com/zfoo/net/packet/IPacketService.java index df36f319..d375a6e5 100644 --- a/net/src/main/java/com/zfoo/net/packet/IPacketService.java +++ b/net/src/main/java/com/zfoo/net/packet/IPacketService.java @@ -13,7 +13,6 @@ package com.zfoo.net.packet; import com.zfoo.net.router.attachment.IAttachment; -import com.zfoo.protocol.IPacket; import io.netty.buffer.ByteBuf; import org.springframework.lang.Nullable; 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 235bf7c1..e0b5fbb0 100644 --- a/net/src/main/java/com/zfoo/net/packet/PacketService.java +++ b/net/src/main/java/com/zfoo/net/packet/PacketService.java @@ -15,7 +15,6 @@ package com.zfoo.net.packet; import com.zfoo.net.NetContext; import com.zfoo.net.router.attachment.IAttachment; import com.zfoo.net.router.route.PacketBus; -import com.zfoo.protocol.IPacket; import com.zfoo.protocol.ProtocolManager; import com.zfoo.protocol.buffer.ByteBufUtils; import com.zfoo.protocol.collection.CollectionUtils; 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 15f9c781..50ea7083 100644 --- a/net/src/main/java/com/zfoo/net/packet/common/Error.java +++ b/net/src/main/java/com/zfoo/net/packet/common/Error.java @@ -15,7 +15,7 @@ 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.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.ProtocolManager; import com.zfoo.protocol.anno.Protocol; import org.slf4j.helpers.FormattingTuple; 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 8f511ca3..6bb0fbe3 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,7 @@ package com.zfoo.net.packet.common; import com.baidu.bjf.remoting.protobuf.annotation.ProtobufClass; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 978dab15..07445355 100644 --- a/net/src/main/java/com/zfoo/net/packet/common/Message.java +++ b/net/src/main/java/com/zfoo/net/packet/common/Message.java @@ -14,7 +14,7 @@ package com.zfoo.net.packet.common; import com.baidu.bjf.remoting.protobuf.annotation.ProtobufClass; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.ProtocolManager; import com.zfoo.protocol.anno.Protocol; 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 26909305..716a1d54 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,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.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; import java.util.Objects; 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 780cf88b..c8adb7d1 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,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.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 682505b0..1f2cdb44 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,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.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 fecf06e2..09f2c334 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,7 @@ package com.zfoo.net.packet.common; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 58ffdec2..8d8b5df4 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,7 @@ package com.zfoo.net.packet.common; import com.baidu.bjf.remoting.protobuf.annotation.ProtobufClass; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 fc44c8c3..794fb012 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,7 @@ 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.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 3a8e1546..f7345c6e 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,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.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 d25c6fbf..64727b39 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,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.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 b6f05cfe..d11a149a 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,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.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 66bef715..95577a98 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,7 @@ package com.zfoo.net.packet.common; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** diff --git a/net/src/main/java/com/zfoo/net/router/IRouter.java b/net/src/main/java/com/zfoo/net/router/IRouter.java index a51eb04e..a329652a 100644 --- a/net/src/main/java/com/zfoo/net/router/IRouter.java +++ b/net/src/main/java/com/zfoo/net/router/IRouter.java @@ -13,11 +13,11 @@ package com.zfoo.net.router; +import com.zfoo.net.packet.IPacket; import com.zfoo.net.router.answer.AsyncAnswer; import com.zfoo.net.router.answer.SyncAnswer; import com.zfoo.net.router.attachment.IAttachment; import com.zfoo.net.session.Session; -import com.zfoo.protocol.IPacket; import org.springframework.lang.Nullable; /** 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 1abed694..5e2c8fb8 100644 --- a/net/src/main/java/com/zfoo/net/router/Router.java +++ b/net/src/main/java/com/zfoo/net/router/Router.java @@ -20,6 +20,7 @@ import com.zfoo.net.core.gateway.model.AuthUidToGatewayCheck; import com.zfoo.net.core.gateway.model.AuthUidToGatewayConfirm; import com.zfoo.net.core.gateway.model.AuthUidToGatewayEvent; import com.zfoo.net.packet.EncodedPacketInfo; +import com.zfoo.net.packet.IPacket; import com.zfoo.net.packet.common.Error; import com.zfoo.net.packet.common.Heartbeat; import com.zfoo.net.router.answer.AsyncAnswer; @@ -35,7 +36,6 @@ import com.zfoo.net.router.route.SignalBridge; import com.zfoo.net.session.Session; import com.zfoo.net.task.PacketReceiverTask; import com.zfoo.net.task.TaskBus; -import com.zfoo.protocol.IPacket; import com.zfoo.protocol.exception.ExceptionUtils; import com.zfoo.protocol.util.JsonUtils; import com.zfoo.protocol.util.StringUtils; diff --git a/net/src/main/java/com/zfoo/net/router/answer/AsyncAnswer.java b/net/src/main/java/com/zfoo/net/router/answer/AsyncAnswer.java index d790432b..94d0cddd 100644 --- a/net/src/main/java/com/zfoo/net/router/answer/AsyncAnswer.java +++ b/net/src/main/java/com/zfoo/net/router/answer/AsyncAnswer.java @@ -13,8 +13,8 @@ package com.zfoo.net.router.answer; +import com.zfoo.net.packet.IPacket; import com.zfoo.net.router.attachment.SignalAttachment; -import com.zfoo.protocol.IPacket; import com.zfoo.protocol.util.ThreadUtils; import java.util.ArrayList; diff --git a/net/src/main/java/com/zfoo/net/router/answer/IAsyncAnswer.java b/net/src/main/java/com/zfoo/net/router/answer/IAsyncAnswer.java index 133a4031..fe16da9a 100644 --- a/net/src/main/java/com/zfoo/net/router/answer/IAsyncAnswer.java +++ b/net/src/main/java/com/zfoo/net/router/answer/IAsyncAnswer.java @@ -13,7 +13,7 @@ package com.zfoo.net.router.answer; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import java.util.function.Consumer; diff --git a/net/src/main/java/com/zfoo/net/router/answer/ISyncAnswer.java b/net/src/main/java/com/zfoo/net/router/answer/ISyncAnswer.java index 02a74e6f..01778b7a 100644 --- a/net/src/main/java/com/zfoo/net/router/answer/ISyncAnswer.java +++ b/net/src/main/java/com/zfoo/net/router/answer/ISyncAnswer.java @@ -13,8 +13,8 @@ package com.zfoo.net.router.answer; +import com.zfoo.net.packet.IPacket; import com.zfoo.net.router.attachment.SignalAttachment; -import com.zfoo.protocol.IPacket; /** * @author godotg diff --git a/net/src/main/java/com/zfoo/net/router/answer/SyncAnswer.java b/net/src/main/java/com/zfoo/net/router/answer/SyncAnswer.java index 603df0ec..f0f11a52 100644 --- a/net/src/main/java/com/zfoo/net/router/answer/SyncAnswer.java +++ b/net/src/main/java/com/zfoo/net/router/answer/SyncAnswer.java @@ -13,8 +13,8 @@ package com.zfoo.net.router.answer; +import com.zfoo.net.packet.IPacket; import com.zfoo.net.router.attachment.SignalAttachment; -import com.zfoo.protocol.IPacket; /** * @author godotg 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 index 14f37a32..0708f3f3 100644 --- a/net/src/main/java/com/zfoo/net/router/attachment/IAttachment.java +++ b/net/src/main/java/com/zfoo/net/router/attachment/IAttachment.java @@ -12,7 +12,7 @@ package com.zfoo.net.router.attachment; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; /** * @author godotg 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 12d792b1..9e82e625 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 @@ -13,7 +13,7 @@ package com.zfoo.net.router.attachment; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; import com.zfoo.scheduler.util.TimeUtils; 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 1ba138f6..3f422aaa 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,9 +13,9 @@ 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.IPacket; import com.zfoo.protocol.util.StringUtils; import com.zfoo.protocol.util.UuidUtils; import javassist.*; diff --git a/net/src/main/java/com/zfoo/net/router/receiver/IPacketReceiver.java b/net/src/main/java/com/zfoo/net/router/receiver/IPacketReceiver.java index b96f828b..b189f69f 100644 --- a/net/src/main/java/com/zfoo/net/router/receiver/IPacketReceiver.java +++ b/net/src/main/java/com/zfoo/net/router/receiver/IPacketReceiver.java @@ -13,9 +13,9 @@ 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.IPacket; /** * @author godotg diff --git a/net/src/main/java/com/zfoo/net/router/receiver/PacketReceiverDefinition.java b/net/src/main/java/com/zfoo/net/router/receiver/PacketReceiverDefinition.java index 32974df2..42875935 100644 --- a/net/src/main/java/com/zfoo/net/router/receiver/PacketReceiverDefinition.java +++ b/net/src/main/java/com/zfoo/net/router/receiver/PacketReceiverDefinition.java @@ -13,9 +13,9 @@ 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.IPacket; import com.zfoo.protocol.util.ReflectionUtils; import java.lang.reflect.Method; 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 0a9759e3..1b46bf09 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 @@ -13,6 +13,7 @@ package com.zfoo.net.router.route; +import com.zfoo.net.packet.IPacket; import com.zfoo.net.packet.PacketService; import com.zfoo.net.router.attachment.GatewayAttachment; import com.zfoo.net.router.attachment.IAttachment; @@ -22,7 +23,6 @@ import com.zfoo.net.router.receiver.IPacketReceiver; import com.zfoo.net.router.receiver.PacketReceiver; import com.zfoo.net.router.receiver.PacketReceiverDefinition; import com.zfoo.net.session.Session; -import com.zfoo.protocol.IPacket; import com.zfoo.protocol.ProtocolManager; import com.zfoo.protocol.collection.ArrayUtils; import com.zfoo.protocol.exception.RunException; diff --git a/net/src/main/java/com/zfoo/net/task/PacketReceiverTask.java b/net/src/main/java/com/zfoo/net/task/PacketReceiverTask.java index eb4b3fe3..f25ef531 100644 --- a/net/src/main/java/com/zfoo/net/task/PacketReceiverTask.java +++ b/net/src/main/java/com/zfoo/net/task/PacketReceiverTask.java @@ -13,9 +13,9 @@ package com.zfoo.net.task; import com.zfoo.net.NetContext; +import com.zfoo.net.packet.IPacket; import com.zfoo.net.router.attachment.IAttachment; import com.zfoo.net.session.Session; -import com.zfoo.protocol.IPacket; /** * @author godotg 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 5cd02665..6ec44582 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 @@ -13,7 +13,6 @@ package com.zfoo.net.packet; -import com.zfoo.protocol.IPacket; import com.zfoo.protocol.anno.Protocol; import java.util.Arrays; 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 dec29314..a5e4cd49 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 @@ -13,7 +13,6 @@ package com.zfoo.net.packet; -import com.zfoo.protocol.IPacket; import com.zfoo.protocol.anno.Protocol; import java.util.Objects; 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 c929b3a1..de5069a2 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 @@ -13,7 +13,6 @@ package com.zfoo.net.packet; -import com.zfoo.protocol.IPacket; import com.zfoo.protocol.anno.Protocol; import java.util.Objects; 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 62b19d92..6f07231f 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 @@ -13,7 +13,6 @@ package com.zfoo.net.packet; -import com.zfoo.protocol.IPacket; import com.zfoo.protocol.anno.Protocol; import java.util.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 294b6257..db3ee495 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 @@ -13,7 +13,6 @@ package com.zfoo.net.packet; -import com.zfoo.protocol.IPacket; import com.zfoo.protocol.anno.Protocol; import java.util.List; 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 ff529df7..b5af54f8 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 @@ -13,7 +13,6 @@ package com.zfoo.net.packet; -import com.zfoo.protocol.IPacket; import com.zfoo.protocol.anno.Protocol; import java.util.Objects; 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 b0c6eaa0..835d33c9 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 @@ -13,7 +13,6 @@ package com.zfoo.net.packet; -import com.zfoo.protocol.IPacket; import com.zfoo.protocol.anno.Protocol; import java.util.List; 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 136c1b72..858c7574 100644 --- a/net/src/test/java/com/zfoo/net/packet/ObjectA.java +++ b/net/src/test/java/com/zfoo/net/packet/ObjectA.java @@ -13,7 +13,6 @@ package com.zfoo.net.packet; -import com.zfoo.protocol.IPacket; import com.zfoo.protocol.anno.Protocol; import java.util.Objects; 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 59d9e9d8..9c96a405 100644 --- a/net/src/test/java/com/zfoo/net/packet/ObjectB.java +++ b/net/src/test/java/com/zfoo/net/packet/ObjectB.java @@ -13,7 +13,6 @@ package com.zfoo.net.packet; -import com.zfoo.protocol.IPacket; import com.zfoo.protocol.anno.Protocol; import java.util.Objects; 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 82f53c9e..9319d66d 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 @@ -13,7 +13,6 @@ package com.zfoo.net.packet; -import com.zfoo.protocol.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 0b6f1e35..e1592c81 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 @@ -13,7 +13,6 @@ package com.zfoo.net.packet; -import com.zfoo.protocol.IPacket; import com.zfoo.protocol.anno.Protocol; import java.util.Objects; 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 4af168f0..f5561e67 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 @@ -13,7 +13,6 @@ package com.zfoo.net.packet; -import com.zfoo.protocol.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 b5cb253a..9dfe0282 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,7 @@ package com.zfoo.net.packet.csharp; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; import java.util.List; 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 d5005895..6b186e04 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,7 @@ package com.zfoo.net.packet.csharp; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 d5dbc572..fd05dc6c 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,7 @@ package com.zfoo.net.packet.csharp; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 9f25c2e7..3141d4e8 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,7 @@ package com.zfoo.net.packet.gateway; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 f046d6d6..ae7300c2 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,7 @@ package com.zfoo.net.packet.gateway; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 f90598b9..04ccc7d1 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,7 @@ package com.zfoo.net.packet.http; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 936f40f6..d01de1c4 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,7 @@ package com.zfoo.net.packet.http; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 52e1ca70..a68d95c6 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,7 @@ package com.zfoo.net.packet.jprotobuf; import com.baidu.bjf.remoting.protobuf.annotation.Protobuf; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 1a2ca7e7..4c6f3590 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,7 @@ package com.zfoo.net.packet.jprotobuf; import com.baidu.bjf.remoting.protobuf.annotation.Protobuf; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 8a9fe95a..75e3dee0 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,7 @@ package com.zfoo.net.packet.json; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 991d07d1..adae168c 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,7 @@ package com.zfoo.net.packet.json; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 5bbe0011..b3aa873e 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,7 @@ package com.zfoo.net.packet.provider; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 259f395d..46a03caf 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,7 @@ package com.zfoo.net.packet.provider; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 ca8b6c5a..4ae7d2f8 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,7 @@ package com.zfoo.net.packet.tcp; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 a99c9ada..20d39ca6 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,7 @@ package com.zfoo.net.packet.tcp; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 456f7840..a2427315 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,7 @@ package com.zfoo.net.packet.tcp; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 6df7a96b..f7580be4 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,7 @@ package com.zfoo.net.packet.tcp; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 fb64eb39..b957e40d 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,7 @@ package com.zfoo.net.packet.tcp; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 03852a8a..7f7f31f1 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,7 @@ package com.zfoo.net.packet.tcp; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 121936c9..a285472f 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,7 @@ package com.zfoo.net.packet.udp; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 1e2889af..a5981e6f 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,7 @@ package com.zfoo.net.packet.udp; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 3bd97acc..b91428a5 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,7 @@ package com.zfoo.net.packet.websocket; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; import java.util.Objects; 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 b2aa9e0d..04fe4f21 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,7 @@ package com.zfoo.net.packet.websocket; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; import java.util.Objects; 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 a56bba8c..4225bb30 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,7 @@ package com.zfoo.net.packet.websocket; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; import java.util.List; 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 cb27b01a..fbcbc97c 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,7 @@ package com.zfoo.net.packet.websocket; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 511a7f2a..977b2a2a 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,7 @@ package com.zfoo.net.packet.websocket; -import com.zfoo.protocol.IPacket; +import com.zfoo.net.packet.IPacket; import com.zfoo.protocol.anno.Protocol; /** 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 ec51a66a..a3392e7c 100644 --- a/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java +++ b/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java @@ -200,7 +200,6 @@ public class ProtocolAnalysis { for (var moduleDefinition : xmlProtocols.getModules()) { var module = modules[moduleDefinition.getId()]; var packetClazzList = moduleDefinitionClassMap.get(moduleDefinition.getId()); - ; if (CollectionUtils.isEmpty(packetClazzList)) { continue; } diff --git a/storage/src/test/java/com/zfoo/storage/export/ExportBinaryTest.java b/storage/src/test/java/com/zfoo/storage/export/ExportBinaryTest.java index b423b6c1..1bf46150 100644 --- a/storage/src/test/java/com/zfoo/storage/export/ExportBinaryTest.java +++ b/storage/src/test/java/com/zfoo/storage/export/ExportBinaryTest.java @@ -12,7 +12,6 @@ package com.zfoo.storage.export; -import com.zfoo.protocol.IPacket; import com.zfoo.protocol.ProtocolManager; import com.zfoo.protocol.buffer.ByteBufUtils; import com.zfoo.protocol.generate.GenerateOperation; @@ -45,7 +44,7 @@ import java.util.Map; @Ignore public class ExportBinaryTest { - public static class User implements IPacket { + public static class User { public String id; public String name; @@ -55,7 +54,7 @@ public class ExportBinaryTest { } @Storage - public static class StudentResource implements IPacket { + public static class StudentResource { @Id public int id; @@ -71,7 +70,7 @@ public class ExportBinaryTest { } - public static class ResourceData implements IPacket { + public static class ResourceData { public Map studentResources;