From d77792cbfc1d031c795da2152d2601153983d50a Mon Sep 17 00:00:00 2001 From: godotg Date: Mon, 12 Dec 2022 18:57:11 +0800 Subject: [PATCH] ref[net]: refactored the packet service --- .../src/main/java/com/zfoo/boot/NetAutoConfiguration.java | 2 +- net/src/main/java/com/zfoo/net/NetContext.java | 4 ++-- net/src/main/java/com/zfoo/net/config/ConfigManager.java | 2 +- net/src/main/java/com/zfoo/net/config/IConfigManager.java | 2 +- .../java/com/zfoo/net/config/model/ConsumerConfig.java | 4 +--- .../java/com/zfoo/net/config/model/ConsumerModule.java | 2 +- .../java/com/zfoo/net/config/model/MonitorConfig.java | 2 +- .../main/java/com/zfoo/net/config/model/NetConfig.java | 2 +- .../java/com/zfoo/net/config/model/ProviderConfig.java | 2 +- .../java/com/zfoo/net/config/model/ProviderModule.java | 3 +-- .../java/com/zfoo/net/config/model/RegistryConfig.java | 2 +- net/src/main/java/com/zfoo/net/core/AbstractClient.java | 2 +- net/src/main/java/com/zfoo/net/core/AbstractServer.java | 2 +- net/src/main/java/com/zfoo/net/core/IClient.java | 2 +- net/src/main/java/com/zfoo/net/core/IServer.java | 2 +- .../zfoo/net/core/event/ClientSessionInactiveEvent.java | 2 +- .../zfoo/net/core/event/ServerSessionInactiveEvent.java | 2 +- .../java/com/zfoo/net/core/gateway/GatewayServer.java | 2 +- .../com/zfoo/net/core/gateway/IGatewayLoadBalancer.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 | 4 ++-- .../net/core/gateway/model/AuthUidToGatewayCheck.java | 4 ++-- .../net/core/gateway/model/AuthUidToGatewayConfirm.java | 4 ++-- .../net/core/gateway/model/AuthUidToGatewayEvent.java | 2 +- .../net/core/gateway/model/GatewaySessionInactiveAsk.java | 4 ++-- .../core/gateway/model/GatewaySessionInactiveEvent.java | 2 +- .../net/core/gateway/model/GatewaySynchronizeSidAsk.java | 4 ++-- net/src/main/java/com/zfoo/net/core/http/HttpServer.java | 4 ++-- .../zfoo/net/core/jprotobuf/JProtobufGatewayServer.java | 2 +- .../com/zfoo/net/core/jprotobuf/JProtobufTcpClient.java | 2 +- .../com/zfoo/net/core/jprotobuf/JProtobufTcpServer.java | 2 +- net/src/main/java/com/zfoo/net/core/tcp/TcpClient.java | 2 +- net/src/main/java/com/zfoo/net/core/tcp/TcpServer.java | 2 +- net/src/main/java/com/zfoo/net/core/udp/UdpClient.java | 2 +- net/src/main/java/com/zfoo/net/core/udp/UdpServer.java | 2 +- .../java/com/zfoo/net/core/websocket/WebsocketClient.java | 2 +- .../java/com/zfoo/net/core/websocket/WebsocketServer.java | 2 +- .../main/java/com/zfoo/net/handler/BaseRouteHandler.java | 4 ++-- .../java/com/zfoo/net/handler/ClientRouteHandler.java | 2 +- .../java/com/zfoo/net/handler/GatewayRouteHandler.java | 4 ++-- .../java/com/zfoo/net/handler/ServerRouteHandler.java | 2 +- .../com/zfoo/net/handler/codec/http/HttpCodecHandler.java | 6 +++--- .../handler/codec/jprotobuf/JProtobufTcpCodecHandler.java | 8 ++++---- .../net/handler/codec/json/JsonWebSocketCodecHandler.java | 4 ++-- .../com/zfoo/net/handler/codec/tcp/TcpCodecHandler.java | 8 ++++---- .../com/zfoo/net/handler/codec/udp/UdpCodecHandler.java | 8 ++++---- .../handler/codec/websocket/WebSocketCodecHandler.java | 8 ++++---- .../java/com/zfoo/net/handler/idle/ClientIdleHandler.java | 4 ++-- .../java/com/zfoo/net/handler/idle/ServerIdleHandler.java | 2 +- .../zfoo/net/packet/{model => }/DecodedPacketInfo.java | 5 ++--- .../zfoo/net/packet/{model => }/EncodedPacketInfo.java | 5 ++--- .../com/zfoo/net/packet/{service => }/IPacketService.java | 6 ++---- .../com/zfoo/net/packet/{service => }/PacketService.java | 6 ++---- net/src/main/java/com/zfoo/net/packet/common/Error.java | 4 ++-- .../main/java/com/zfoo/net/packet/common/Heartbeat.java | 4 ++-- net/src/main/java/com/zfoo/net/packet/common/Message.java | 4 ++-- net/src/main/java/com/zfoo/net/packet/common/PairLS.java | 4 ++-- .../main/java/com/zfoo/net/packet/common/PairLong.java | 4 ++-- .../main/java/com/zfoo/net/packet/common/PairString.java | 4 ++-- net/src/main/java/com/zfoo/net/packet/common/Ping.java | 4 ++-- net/src/main/java/com/zfoo/net/packet/common/Pong.java | 4 ++-- .../main/java/com/zfoo/net/packet/common/TripleLLS.java | 4 ++-- .../main/java/com/zfoo/net/packet/common/TripleLSS.java | 4 ++-- .../main/java/com/zfoo/net/packet/common/TripleLong.java | 4 ++-- .../java/com/zfoo/net/packet/common/TripleString.java | 4 ++-- net/src/main/java/com/zfoo/net/router/Router.java | 2 +- .../main/java/com/zfoo/net/router/route/PacketBus.java | 2 +- .../java/com/zfoo/net/schema/NetDefinitionParser.java | 2 +- net/src/main/java/com/zfoo/net/util/SessionUtils.java | 2 +- .../test/java/com/zfoo/net/core/http/HttpServerTest.java | 2 +- .../com/zfoo/net/core/tcpAsync/server/TcpServerTest.java | 2 +- net/src/test/java/com/zfoo/net/packet/CM_Array.java | 2 +- net/src/test/java/com/zfoo/net/packet/CM_Float.java | 2 +- net/src/test/java/com/zfoo/net/packet/CM_Int.java | 2 +- net/src/test/java/com/zfoo/net/packet/CM_List.java | 2 +- net/src/test/java/com/zfoo/net/packet/CM_Map.java | 2 +- net/src/test/java/com/zfoo/net/packet/CM_Object.java | 2 +- net/src/test/java/com/zfoo/net/packet/CM_Set.java | 2 +- net/src/test/java/com/zfoo/net/packet/ObjectA.java | 2 +- net/src/test/java/com/zfoo/net/packet/ObjectB.java | 2 +- net/src/test/java/com/zfoo/net/packet/SM_Float.java | 2 +- net/src/test/java/com/zfoo/net/packet/SM_Int.java | 2 +- net/src/test/java/com/zfoo/net/packet/SM_Object.java | 2 +- .../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 +- .../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 +- .../com/zfoo/net/packet/provider/ProviderMessAsk.java | 2 +- .../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 +- .../test/java/com/zfoo/net/packet/tcp/SyncMessAsk.java | 2 +- .../java/com/zfoo/net/packet/tcp/TcpHelloRequest.java | 2 +- .../java/com/zfoo/net/packet/tcp/TcpHelloResponse.java | 2 +- .../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 +- net/src/test/java/com/zfoo/net/protocol/ProtocolTest.java | 3 --- net/src/test/resources/protocol.xml | 2 +- 112 files changed, 152 insertions(+), 164 deletions(-) rename net/src/main/java/com/zfoo/net/packet/{model => }/DecodedPacketInfo.java (96%) rename net/src/main/java/com/zfoo/net/packet/{model => }/EncodedPacketInfo.java (97%) rename net/src/main/java/com/zfoo/net/packet/{service => }/IPacketService.java (89%) rename net/src/main/java/com/zfoo/net/packet/{service => }/PacketService.java (98%) diff --git a/boot/src/main/java/com/zfoo/boot/NetAutoConfiguration.java b/boot/src/main/java/com/zfoo/boot/NetAutoConfiguration.java index b1111ddd..3e168e97 100644 --- a/boot/src/main/java/com/zfoo/boot/NetAutoConfiguration.java +++ b/boot/src/main/java/com/zfoo/boot/NetAutoConfiguration.java @@ -16,7 +16,7 @@ import com.zfoo.net.NetContext; import com.zfoo.net.config.ConfigManager; import com.zfoo.net.config.model.NetConfig; import com.zfoo.net.consumer.Consumer; -import com.zfoo.net.packet.service.PacketService; +import com.zfoo.net.packet.PacketService; import com.zfoo.net.router.Router; import com.zfoo.net.session.SessionManager; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; diff --git a/net/src/main/java/com/zfoo/net/NetContext.java b/net/src/main/java/com/zfoo/net/NetContext.java index a554a9da..113b9e37 100644 --- a/net/src/main/java/com/zfoo/net/NetContext.java +++ b/net/src/main/java/com/zfoo/net/NetContext.java @@ -17,7 +17,7 @@ import com.zfoo.net.config.IConfigManager; import com.zfoo.net.consumer.IConsumer; import com.zfoo.net.core.AbstractClient; import com.zfoo.net.core.AbstractServer; -import com.zfoo.net.packet.service.IPacketService; +import com.zfoo.net.packet.IPacketService; import com.zfoo.net.router.IRouter; import com.zfoo.net.session.ISessionManager; import com.zfoo.net.session.Session; @@ -43,7 +43,7 @@ import java.util.ArrayList; import java.util.concurrent.ExecutorService; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class NetContext implements ApplicationListener, Ordered { diff --git a/net/src/main/java/com/zfoo/net/config/ConfigManager.java b/net/src/main/java/com/zfoo/net/config/ConfigManager.java index 417ff830..12fd3a7f 100644 --- a/net/src/main/java/com/zfoo/net/config/ConfigManager.java +++ b/net/src/main/java/com/zfoo/net/config/ConfigManager.java @@ -26,7 +26,7 @@ import java.util.HashSet; import java.util.Objects; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class ConfigManager implements IConfigManager { diff --git a/net/src/main/java/com/zfoo/net/config/IConfigManager.java b/net/src/main/java/com/zfoo/net/config/IConfigManager.java index 087930b4..bfc56bce 100644 --- a/net/src/main/java/com/zfoo/net/config/IConfigManager.java +++ b/net/src/main/java/com/zfoo/net/config/IConfigManager.java @@ -16,7 +16,7 @@ import com.zfoo.net.config.model.NetConfig; import com.zfoo.net.consumer.registry.IRegistry; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public interface IConfigManager { diff --git a/net/src/main/java/com/zfoo/net/config/model/ConsumerConfig.java b/net/src/main/java/com/zfoo/net/config/model/ConsumerConfig.java index 003fc7c4..eaef5734 100644 --- a/net/src/main/java/com/zfoo/net/config/model/ConsumerConfig.java +++ b/net/src/main/java/com/zfoo/net/config/model/ConsumerConfig.java @@ -14,13 +14,11 @@ package com.zfoo.net.config.model; -import com.zfoo.protocol.registration.ProtocolModule; - import java.util.List; import java.util.Objects; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class ConsumerConfig { diff --git a/net/src/main/java/com/zfoo/net/config/model/ConsumerModule.java b/net/src/main/java/com/zfoo/net/config/model/ConsumerModule.java index 5dcc340c..45b6825a 100644 --- a/net/src/main/java/com/zfoo/net/config/model/ConsumerModule.java +++ b/net/src/main/java/com/zfoo/net/config/model/ConsumerModule.java @@ -17,7 +17,7 @@ import com.zfoo.protocol.registration.ProtocolModule; import java.util.Objects; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class ConsumerModule { diff --git a/net/src/main/java/com/zfoo/net/config/model/MonitorConfig.java b/net/src/main/java/com/zfoo/net/config/model/MonitorConfig.java index a725045e..970cbf4f 100644 --- a/net/src/main/java/com/zfoo/net/config/model/MonitorConfig.java +++ b/net/src/main/java/com/zfoo/net/config/model/MonitorConfig.java @@ -17,7 +17,7 @@ import java.util.Map; import java.util.Objects; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class MonitorConfig { diff --git a/net/src/main/java/com/zfoo/net/config/model/NetConfig.java b/net/src/main/java/com/zfoo/net/config/model/NetConfig.java index 121d9ba8..82b462d3 100644 --- a/net/src/main/java/com/zfoo/net/config/model/NetConfig.java +++ b/net/src/main/java/com/zfoo/net/config/model/NetConfig.java @@ -19,7 +19,7 @@ import com.zfoo.protocol.generate.GenerateOperation; import java.util.Objects; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class NetConfig { diff --git a/net/src/main/java/com/zfoo/net/config/model/ProviderConfig.java b/net/src/main/java/com/zfoo/net/config/model/ProviderConfig.java index d5ef24a9..f4ad9c14 100644 --- a/net/src/main/java/com/zfoo/net/config/model/ProviderConfig.java +++ b/net/src/main/java/com/zfoo/net/config/model/ProviderConfig.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Objects; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class ProviderConfig { diff --git a/net/src/main/java/com/zfoo/net/config/model/ProviderModule.java b/net/src/main/java/com/zfoo/net/config/model/ProviderModule.java index fe1b4409..42ed1edf 100644 --- a/net/src/main/java/com/zfoo/net/config/model/ProviderModule.java +++ b/net/src/main/java/com/zfoo/net/config/model/ProviderModule.java @@ -17,8 +17,7 @@ import com.zfoo.protocol.registration.ProtocolModule; import java.util.Objects; /** - * - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class ProviderModule { diff --git a/net/src/main/java/com/zfoo/net/config/model/RegistryConfig.java b/net/src/main/java/com/zfoo/net/config/model/RegistryConfig.java index a808cb2e..c88689c8 100644 --- a/net/src/main/java/com/zfoo/net/config/model/RegistryConfig.java +++ b/net/src/main/java/com/zfoo/net/config/model/RegistryConfig.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class RegistryConfig { diff --git a/net/src/main/java/com/zfoo/net/core/AbstractClient.java b/net/src/main/java/com/zfoo/net/core/AbstractClient.java index e762e2c9..a7cfb82e 100644 --- a/net/src/main/java/com/zfoo/net/core/AbstractClient.java +++ b/net/src/main/java/com/zfoo/net/core/AbstractClient.java @@ -32,7 +32,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public abstract class AbstractClient implements IClient { diff --git a/net/src/main/java/com/zfoo/net/core/AbstractServer.java b/net/src/main/java/com/zfoo/net/core/AbstractServer.java index 48715120..885d5427 100644 --- a/net/src/main/java/com/zfoo/net/core/AbstractServer.java +++ b/net/src/main/java/com/zfoo/net/core/AbstractServer.java @@ -32,7 +32,7 @@ import java.util.ArrayList; import java.util.List; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public abstract class AbstractServer implements IServer { diff --git a/net/src/main/java/com/zfoo/net/core/IClient.java b/net/src/main/java/com/zfoo/net/core/IClient.java index cafd6b89..f5b3b47e 100644 --- a/net/src/main/java/com/zfoo/net/core/IClient.java +++ b/net/src/main/java/com/zfoo/net/core/IClient.java @@ -16,7 +16,7 @@ package com.zfoo.net.core; import com.zfoo.net.session.Session; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public interface IClient { diff --git a/net/src/main/java/com/zfoo/net/core/IServer.java b/net/src/main/java/com/zfoo/net/core/IServer.java index 2fe94810..abf6cd11 100644 --- a/net/src/main/java/com/zfoo/net/core/IServer.java +++ b/net/src/main/java/com/zfoo/net/core/IServer.java @@ -14,7 +14,7 @@ package com.zfoo.net.core; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public interface IServer { diff --git a/net/src/main/java/com/zfoo/net/core/event/ClientSessionInactiveEvent.java b/net/src/main/java/com/zfoo/net/core/event/ClientSessionInactiveEvent.java index e60f78aa..33267489 100644 --- a/net/src/main/java/com/zfoo/net/core/event/ClientSessionInactiveEvent.java +++ b/net/src/main/java/com/zfoo/net/core/event/ClientSessionInactiveEvent.java @@ -16,7 +16,7 @@ import com.zfoo.event.model.event.IEvent; import com.zfoo.net.session.Session; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class ClientSessionInactiveEvent implements IEvent { diff --git a/net/src/main/java/com/zfoo/net/core/event/ServerSessionInactiveEvent.java b/net/src/main/java/com/zfoo/net/core/event/ServerSessionInactiveEvent.java index b42d79d8..13fd9016 100644 --- a/net/src/main/java/com/zfoo/net/core/event/ServerSessionInactiveEvent.java +++ b/net/src/main/java/com/zfoo/net/core/event/ServerSessionInactiveEvent.java @@ -16,7 +16,7 @@ import com.zfoo.event.model.event.IEvent; import com.zfoo.net.session.Session; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class ServerSessionInactiveEvent implements IEvent { 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 2289d09f..11692b45 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 @@ -28,7 +28,7 @@ import org.springframework.lang.Nullable; import java.util.function.BiFunction; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class GatewayServer extends AbstractServer { diff --git a/net/src/main/java/com/zfoo/net/core/gateway/IGatewayLoadBalancer.java b/net/src/main/java/com/zfoo/net/core/gateway/IGatewayLoadBalancer.java index c832b3de..9ae83f8d 100644 --- a/net/src/main/java/com/zfoo/net/core/gateway/IGatewayLoadBalancer.java +++ b/net/src/main/java/com/zfoo/net/core/gateway/IGatewayLoadBalancer.java @@ -16,7 +16,7 @@ package com.zfoo.net.core.gateway; /** * 网关负载均衡使用计算一致性hash的参数，如果packet继承了这个接口，则网关的一致性hash负载均衡优先使用这个接口计算一致性hash； * - * @author jaysunxiao + * @author godotg * @version 3.0 */ public interface IGatewayLoadBalancer { 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 e91ddc76..56913cc0 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 @@ -33,7 +33,7 @@ import org.springframework.lang.Nullable; import java.util.function.BiFunction; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class WebsocketGatewayServer extends AbstractServer { 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 10693b7a..1124ba66 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 @@ -39,7 +39,7 @@ import java.io.InputStream; import java.util.function.BiFunction; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class WebsocketSslGatewayServer extends AbstractServer { 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 63742a2f..1b0f43c5 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 @@ -16,12 +16,12 @@ package com.zfoo.net.core.gateway.model; import com.zfoo.protocol.IPacket; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class AuthUidAsk implements IPacket { - public static final transient short PROTOCOL_ID = 22; + public static final short PROTOCOL_ID = 22; 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 9e9f0e2d..3d000de2 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 @@ -18,12 +18,12 @@ import com.zfoo.protocol.IPacket; /** * 网关登录成功过后，将uid授权给网关 * - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class AuthUidToGatewayCheck implements IPacket { - public static final transient short PROTOCOL_ID = 20; + public static final short PROTOCOL_ID = 20; 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 270aa57a..86da4b97 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 @@ -18,12 +18,12 @@ import com.zfoo.protocol.IPacket; /** * 网关登录成功过后，将uid授权给网关的返回 * - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class AuthUidToGatewayConfirm implements IPacket { - public static final transient short PROTOCOL_ID = 21; + public static final short PROTOCOL_ID = 21; private long uid; diff --git a/net/src/main/java/com/zfoo/net/core/gateway/model/AuthUidToGatewayEvent.java b/net/src/main/java/com/zfoo/net/core/gateway/model/AuthUidToGatewayEvent.java index 6f53f3a5..98754df1 100644 --- a/net/src/main/java/com/zfoo/net/core/gateway/model/AuthUidToGatewayEvent.java +++ b/net/src/main/java/com/zfoo/net/core/gateway/model/AuthUidToGatewayEvent.java @@ -16,7 +16,7 @@ package com.zfoo.net.core.gateway.model; import com.zfoo.event.model.event.IEvent; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class AuthUidToGatewayEvent implements IEvent { 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 c72ab212..4122dc99 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 @@ -16,12 +16,12 @@ package com.zfoo.net.core.gateway.model; import com.zfoo.protocol.IPacket; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class GatewaySessionInactiveAsk implements IPacket { - public static final transient short PROTOCOL_ID = 23; + public static final short PROTOCOL_ID = 23; private String gatewayHostAndPort; diff --git a/net/src/main/java/com/zfoo/net/core/gateway/model/GatewaySessionInactiveEvent.java b/net/src/main/java/com/zfoo/net/core/gateway/model/GatewaySessionInactiveEvent.java index 5dacb905..6af1d89d 100644 --- a/net/src/main/java/com/zfoo/net/core/gateway/model/GatewaySessionInactiveEvent.java +++ b/net/src/main/java/com/zfoo/net/core/gateway/model/GatewaySessionInactiveEvent.java @@ -16,7 +16,7 @@ package com.zfoo.net.core.gateway.model; import com.zfoo.event.model.event.IEvent; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class GatewaySessionInactiveEvent implements IEvent { 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 21c788d7..423d520d 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 @@ -20,12 +20,12 @@ import java.util.Map; /** * 同步网关的session信息到push * - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class GatewaySynchronizeSidAsk implements IPacket { - public static final transient short PROTOCOL_ID = 24; + public static final short PROTOCOL_ID = 24; private String gatewayHostAndPort; diff --git a/net/src/main/java/com/zfoo/net/core/http/HttpServer.java b/net/src/main/java/com/zfoo/net/core/http/HttpServer.java index 4f8e0d91..2a5d70bc 100644 --- a/net/src/main/java/com/zfoo/net/core/http/HttpServer.java +++ b/net/src/main/java/com/zfoo/net/core/http/HttpServer.java @@ -16,7 +16,7 @@ package com.zfoo.net.core.http; import com.zfoo.net.core.AbstractServer; import com.zfoo.net.handler.ServerRouteHandler; import com.zfoo.net.handler.codec.http.HttpCodecHandler; -import com.zfoo.net.packet.model.DecodedPacketInfo; +import com.zfoo.net.packet.DecodedPacketInfo; import com.zfoo.protocol.util.IOUtils; import com.zfoo.util.net.HostAndPort; import io.netty.channel.ChannelInitializer; @@ -29,7 +29,7 @@ import io.netty.handler.stream.ChunkedWriteHandler; import java.util.function.Function; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class HttpServer extends AbstractServer { 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 30972b69..47683fa7 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 @@ -28,7 +28,7 @@ import org.springframework.lang.Nullable; import java.util.function.BiFunction; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class JProtobufGatewayServer extends AbstractServer { diff --git a/net/src/main/java/com/zfoo/net/core/jprotobuf/JProtobufTcpClient.java b/net/src/main/java/com/zfoo/net/core/jprotobuf/JProtobufTcpClient.java index 18dec41b..ff792935 100644 --- a/net/src/main/java/com/zfoo/net/core/jprotobuf/JProtobufTcpClient.java +++ b/net/src/main/java/com/zfoo/net/core/jprotobuf/JProtobufTcpClient.java @@ -24,7 +24,7 @@ import io.netty.channel.socket.SocketChannel; import io.netty.handler.timeout.IdleStateHandler; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class JProtobufTcpClient extends AbstractClient { diff --git a/net/src/main/java/com/zfoo/net/core/jprotobuf/JProtobufTcpServer.java b/net/src/main/java/com/zfoo/net/core/jprotobuf/JProtobufTcpServer.java index dd324e64..1c19cd30 100644 --- a/net/src/main/java/com/zfoo/net/core/jprotobuf/JProtobufTcpServer.java +++ b/net/src/main/java/com/zfoo/net/core/jprotobuf/JProtobufTcpServer.java @@ -23,7 +23,7 @@ import io.netty.channel.socket.SocketChannel; import io.netty.handler.timeout.IdleStateHandler; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class JProtobufTcpServer extends AbstractServer { diff --git a/net/src/main/java/com/zfoo/net/core/tcp/TcpClient.java b/net/src/main/java/com/zfoo/net/core/tcp/TcpClient.java index a3fdda63..fc31cc21 100644 --- a/net/src/main/java/com/zfoo/net/core/tcp/TcpClient.java +++ b/net/src/main/java/com/zfoo/net/core/tcp/TcpClient.java @@ -24,7 +24,7 @@ import io.netty.channel.socket.SocketChannel; import io.netty.handler.timeout.IdleStateHandler; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class TcpClient extends AbstractClient { diff --git a/net/src/main/java/com/zfoo/net/core/tcp/TcpServer.java b/net/src/main/java/com/zfoo/net/core/tcp/TcpServer.java index 3b4063b5..59f9bf31 100644 --- a/net/src/main/java/com/zfoo/net/core/tcp/TcpServer.java +++ b/net/src/main/java/com/zfoo/net/core/tcp/TcpServer.java @@ -23,7 +23,7 @@ import io.netty.channel.socket.SocketChannel; import io.netty.handler.timeout.IdleStateHandler; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class TcpServer extends AbstractServer { diff --git a/net/src/main/java/com/zfoo/net/core/udp/UdpClient.java b/net/src/main/java/com/zfoo/net/core/udp/UdpClient.java index 2b05459f..de683eba 100644 --- a/net/src/main/java/com/zfoo/net/core/udp/UdpClient.java +++ b/net/src/main/java/com/zfoo/net/core/udp/UdpClient.java @@ -30,7 +30,7 @@ import io.netty.channel.epoll.EpollDatagramChannel; import io.netty.channel.socket.nio.NioDatagramChannel; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class UdpClient extends AbstractClient { diff --git a/net/src/main/java/com/zfoo/net/core/udp/UdpServer.java b/net/src/main/java/com/zfoo/net/core/udp/UdpServer.java index f753ca60..e65429d0 100644 --- a/net/src/main/java/com/zfoo/net/core/udp/UdpServer.java +++ b/net/src/main/java/com/zfoo/net/core/udp/UdpServer.java @@ -30,7 +30,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class UdpServer extends AbstractServer { diff --git a/net/src/main/java/com/zfoo/net/core/websocket/WebsocketClient.java b/net/src/main/java/com/zfoo/net/core/websocket/WebsocketClient.java index 6a0b4cfb..c10db65b 100644 --- a/net/src/main/java/com/zfoo/net/core/websocket/WebsocketClient.java +++ b/net/src/main/java/com/zfoo/net/core/websocket/WebsocketClient.java @@ -28,7 +28,7 @@ import io.netty.handler.codec.http.websocketx.WebSocketClientProtocolHandler; import io.netty.handler.stream.ChunkedWriteHandler; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class WebsocketClient extends AbstractClient { diff --git a/net/src/main/java/com/zfoo/net/core/websocket/WebsocketServer.java b/net/src/main/java/com/zfoo/net/core/websocket/WebsocketServer.java index 369e66aa..88cd2b8c 100644 --- a/net/src/main/java/com/zfoo/net/core/websocket/WebsocketServer.java +++ b/net/src/main/java/com/zfoo/net/core/websocket/WebsocketServer.java @@ -26,7 +26,7 @@ import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler; import io.netty.handler.stream.ChunkedWriteHandler; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class WebsocketServer extends AbstractServer { diff --git a/net/src/main/java/com/zfoo/net/handler/BaseRouteHandler.java b/net/src/main/java/com/zfoo/net/handler/BaseRouteHandler.java index cf211fee..1e59079d 100644 --- a/net/src/main/java/com/zfoo/net/handler/BaseRouteHandler.java +++ b/net/src/main/java/com/zfoo/net/handler/BaseRouteHandler.java @@ -14,7 +14,7 @@ package com.zfoo.net.handler; import com.zfoo.net.NetContext; -import com.zfoo.net.packet.model.DecodedPacketInfo; +import com.zfoo.net.packet.DecodedPacketInfo; import com.zfoo.net.session.Session; import com.zfoo.net.util.SessionUtils; import com.zfoo.protocol.util.StringUtils; @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ @ChannelHandler.Sharable diff --git a/net/src/main/java/com/zfoo/net/handler/ClientRouteHandler.java b/net/src/main/java/com/zfoo/net/handler/ClientRouteHandler.java index ac5ae001..baf35096 100644 --- a/net/src/main/java/com/zfoo/net/handler/ClientRouteHandler.java +++ b/net/src/main/java/com/zfoo/net/handler/ClientRouteHandler.java @@ -23,7 +23,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ @ChannelHandler.Sharable 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 a7e18d2c..1a2caf8f 100644 --- a/net/src/main/java/com/zfoo/net/handler/GatewayRouteHandler.java +++ b/net/src/main/java/com/zfoo/net/handler/GatewayRouteHandler.java @@ -18,10 +18,10 @@ import com.zfoo.net.NetContext; 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.common.Heartbeat; import com.zfoo.net.packet.common.Ping; import com.zfoo.net.packet.common.Pong; -import com.zfoo.net.packet.model.DecodedPacketInfo; import com.zfoo.net.router.attachment.GatewayAttachment; import com.zfoo.net.router.attachment.IAttachment; import com.zfoo.net.router.attachment.SignalAttachment; @@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory; import java.util.function.BiFunction; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ @ChannelHandler.Sharable diff --git a/net/src/main/java/com/zfoo/net/handler/ServerRouteHandler.java b/net/src/main/java/com/zfoo/net/handler/ServerRouteHandler.java index dc206f4a..7ce38b1a 100644 --- a/net/src/main/java/com/zfoo/net/handler/ServerRouteHandler.java +++ b/net/src/main/java/com/zfoo/net/handler/ServerRouteHandler.java @@ -23,7 +23,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ @ChannelHandler.Sharable 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 7a38253d..d97bee3d 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 @@ -12,9 +12,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.common.Message; -import com.zfoo.net.packet.model.DecodedPacketInfo; -import com.zfoo.net.packet.model.EncodedPacketInfo; import com.zfoo.net.router.attachment.HttpAttachment; import com.zfoo.protocol.IPacket; import com.zfoo.protocol.util.JsonUtils; @@ -30,7 +30,7 @@ import java.util.function.Function; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class HttpCodecHandler extends MessageToMessageCodec { 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 10f95cca..81332a12 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 @@ -15,9 +15,9 @@ package com.zfoo.net.handler.codec.jprotobuf; import com.baidu.bjf.remoting.protobuf.Codec; import com.baidu.bjf.remoting.protobuf.ProtobufProxy; -import com.zfoo.net.packet.model.DecodedPacketInfo; -import com.zfoo.net.packet.model.EncodedPacketInfo; -import com.zfoo.net.packet.service.PacketService; +import com.zfoo.net.packet.DecodedPacketInfo; +import com.zfoo.net.packet.EncodedPacketInfo; +import com.zfoo.net.packet.PacketService; import com.zfoo.net.router.attachment.IAttachment; import com.zfoo.net.util.SessionUtils; import com.zfoo.protocol.IPacket; @@ -39,7 +39,7 @@ import java.util.List; * header(4byte) + protocolId(2byte) + packet * header = body(bytes.length) + protocolId.length(2byte) * - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class JProtobufTcpCodecHandler extends ByteToMessageCodec { 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 68602858..97da57a4 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 @@ -13,8 +13,8 @@ package com.zfoo.net.handler.codec.json; -import com.zfoo.net.packet.model.DecodedPacketInfo; -import com.zfoo.net.packet.model.EncodedPacketInfo; +import com.zfoo.net.packet.DecodedPacketInfo; +import com.zfoo.net.packet.EncodedPacketInfo; import com.zfoo.protocol.IPacket; import com.zfoo.protocol.ProtocolManager; import com.zfoo.protocol.buffer.ByteBufUtils; diff --git a/net/src/main/java/com/zfoo/net/handler/codec/tcp/TcpCodecHandler.java b/net/src/main/java/com/zfoo/net/handler/codec/tcp/TcpCodecHandler.java index 2bb1b609..8cac418d 100644 --- a/net/src/main/java/com/zfoo/net/handler/codec/tcp/TcpCodecHandler.java +++ b/net/src/main/java/com/zfoo/net/handler/codec/tcp/TcpCodecHandler.java @@ -14,9 +14,9 @@ package com.zfoo.net.handler.codec.tcp; import com.zfoo.net.NetContext; -import com.zfoo.net.packet.model.DecodedPacketInfo; -import com.zfoo.net.packet.model.EncodedPacketInfo; -import com.zfoo.net.packet.service.PacketService; +import com.zfoo.net.packet.DecodedPacketInfo; +import com.zfoo.net.packet.EncodedPacketInfo; +import com.zfoo.net.packet.PacketService; import com.zfoo.net.util.SessionUtils; import com.zfoo.protocol.util.IOUtils; import com.zfoo.protocol.util.StringUtils; @@ -33,7 +33,7 @@ import java.util.List; * header(4byte) + protocolId(2byte) + packet * header = body(bytes.length) + protocolId.length(2byte) * - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class TcpCodecHandler extends ByteToMessageCodec { diff --git a/net/src/main/java/com/zfoo/net/handler/codec/udp/UdpCodecHandler.java b/net/src/main/java/com/zfoo/net/handler/codec/udp/UdpCodecHandler.java index 79243357..de2cc964 100644 --- a/net/src/main/java/com/zfoo/net/handler/codec/udp/UdpCodecHandler.java +++ b/net/src/main/java/com/zfoo/net/handler/codec/udp/UdpCodecHandler.java @@ -13,9 +13,9 @@ package com.zfoo.net.handler.codec.udp; import com.zfoo.net.NetContext; -import com.zfoo.net.packet.model.DecodedPacketInfo; -import com.zfoo.net.packet.model.EncodedPacketInfo; -import com.zfoo.net.packet.service.PacketService; +import com.zfoo.net.packet.DecodedPacketInfo; +import com.zfoo.net.packet.EncodedPacketInfo; +import com.zfoo.net.packet.PacketService; import com.zfoo.net.router.attachment.UdpAttachment; import com.zfoo.protocol.util.IOUtils; import com.zfoo.protocol.util.JsonUtils; @@ -32,7 +32,7 @@ import java.net.InetSocketAddress; import java.util.List; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class UdpCodecHandler extends MessageToMessageCodec { diff --git a/net/src/main/java/com/zfoo/net/handler/codec/websocket/WebSocketCodecHandler.java b/net/src/main/java/com/zfoo/net/handler/codec/websocket/WebSocketCodecHandler.java index 8f7e075b..3f430a0c 100644 --- a/net/src/main/java/com/zfoo/net/handler/codec/websocket/WebSocketCodecHandler.java +++ b/net/src/main/java/com/zfoo/net/handler/codec/websocket/WebSocketCodecHandler.java @@ -14,9 +14,9 @@ package com.zfoo.net.handler.codec.websocket; import com.zfoo.net.NetContext; -import com.zfoo.net.packet.model.DecodedPacketInfo; -import com.zfoo.net.packet.model.EncodedPacketInfo; -import com.zfoo.net.packet.service.PacketService; +import com.zfoo.net.packet.DecodedPacketInfo; +import com.zfoo.net.packet.EncodedPacketInfo; +import com.zfoo.net.packet.PacketService; import com.zfoo.protocol.util.IOUtils; import com.zfoo.protocol.util.JsonUtils; import com.zfoo.protocol.util.StringUtils; @@ -35,7 +35,7 @@ import java.util.List; * header(4byte) + protocolId(2byte) + packet * header = body(bytes.length) + protocolId.length(2byte) * - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class WebSocketCodecHandler extends MessageToMessageCodec { diff --git a/net/src/main/java/com/zfoo/net/handler/idle/ClientIdleHandler.java b/net/src/main/java/com/zfoo/net/handler/idle/ClientIdleHandler.java index 5515bf66..4effd720 100644 --- a/net/src/main/java/com/zfoo/net/handler/idle/ClientIdleHandler.java +++ b/net/src/main/java/com/zfoo/net/handler/idle/ClientIdleHandler.java @@ -13,8 +13,8 @@ package com.zfoo.net.handler.idle; +import com.zfoo.net.packet.EncodedPacketInfo; import com.zfoo.net.packet.common.Heartbeat; -import com.zfoo.net.packet.model.EncodedPacketInfo; import com.zfoo.net.util.SessionUtils; import io.netty.channel.ChannelDuplexHandler; import io.netty.channel.ChannelHandler; @@ -25,7 +25,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ @ChannelHandler.Sharable diff --git a/net/src/main/java/com/zfoo/net/handler/idle/ServerIdleHandler.java b/net/src/main/java/com/zfoo/net/handler/idle/ServerIdleHandler.java index 5da37565..7daa5dcb 100644 --- a/net/src/main/java/com/zfoo/net/handler/idle/ServerIdleHandler.java +++ b/net/src/main/java/com/zfoo/net/handler/idle/ServerIdleHandler.java @@ -23,7 +23,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ @ChannelHandler.Sharable diff --git a/net/src/main/java/com/zfoo/net/packet/model/DecodedPacketInfo.java b/net/src/main/java/com/zfoo/net/packet/DecodedPacketInfo.java similarity index 96% rename from net/src/main/java/com/zfoo/net/packet/model/DecodedPacketInfo.java rename to net/src/main/java/com/zfoo/net/packet/DecodedPacketInfo.java index 36021c39..a0f03288 100644 --- a/net/src/main/java/com/zfoo/net/packet/model/DecodedPacketInfo.java +++ b/net/src/main/java/com/zfoo/net/packet/DecodedPacketInfo.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,13 +10,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.net.packet.model; +package com.zfoo.net.packet; import com.zfoo.net.router.attachment.IAttachment; import com.zfoo.protocol.IPacket; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class DecodedPacketInfo { diff --git a/net/src/main/java/com/zfoo/net/packet/model/EncodedPacketInfo.java b/net/src/main/java/com/zfoo/net/packet/EncodedPacketInfo.java similarity index 97% rename from net/src/main/java/com/zfoo/net/packet/model/EncodedPacketInfo.java rename to net/src/main/java/com/zfoo/net/packet/EncodedPacketInfo.java index 9744efaa..edff34e8 100644 --- a/net/src/main/java/com/zfoo/net/packet/model/EncodedPacketInfo.java +++ b/net/src/main/java/com/zfoo/net/packet/EncodedPacketInfo.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,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.net.packet.model; +package com.zfoo.net.packet; import com.zfoo.net.router.attachment.IAttachment; import com.zfoo.protocol.IPacket; @@ -20,7 +19,7 @@ import org.springframework.lang.Nullable; /** * 被解码后的Packet的信息 * - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class EncodedPacketInfo { diff --git a/net/src/main/java/com/zfoo/net/packet/service/IPacketService.java b/net/src/main/java/com/zfoo/net/packet/IPacketService.java similarity index 89% rename from net/src/main/java/com/zfoo/net/packet/service/IPacketService.java rename to net/src/main/java/com/zfoo/net/packet/IPacketService.java index 50af1019..df36f319 100644 --- a/net/src/main/java/com/zfoo/net/packet/service/IPacketService.java +++ b/net/src/main/java/com/zfoo/net/packet/IPacketService.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,16 +10,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.net.packet.service; +package com.zfoo.net.packet; -import com.zfoo.net.packet.model.DecodedPacketInfo; import com.zfoo.net.router.attachment.IAttachment; import com.zfoo.protocol.IPacket; import io.netty.buffer.ByteBuf; import org.springframework.lang.Nullable; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public interface IPacketService { diff --git a/net/src/main/java/com/zfoo/net/packet/service/PacketService.java b/net/src/main/java/com/zfoo/net/packet/PacketService.java similarity index 98% rename from net/src/main/java/com/zfoo/net/packet/service/PacketService.java rename to net/src/main/java/com/zfoo/net/packet/PacketService.java index 60e95c5e..7d9abb70 100644 --- a/net/src/main/java/com/zfoo/net/packet/service/PacketService.java +++ b/net/src/main/java/com/zfoo/net/packet/PacketService.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,10 +10,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.net.packet.service; +package com.zfoo.net.packet; import com.zfoo.net.NetContext; -import com.zfoo.net.packet.model.DecodedPacketInfo; import com.zfoo.net.router.attachment.IAttachment; import com.zfoo.net.router.route.PacketBus; import com.zfoo.protocol.IPacket; @@ -36,7 +34,7 @@ import java.io.IOException; import java.util.function.Predicate; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class PacketService implements IPacketService { 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 496e9a3c..adc74df9 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 @@ -21,13 +21,13 @@ import org.slf4j.helpers.FormattingTuple; import org.slf4j.helpers.MessageFormatter; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ @ProtobufClass public class Error implements IPacket { @Ignore - public static final transient short PROTOCOL_ID = 101; + public static final short PROTOCOL_ID = 101; 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 8d490d08..92d6b3d8 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 @@ -18,14 +18,14 @@ import com.baidu.bjf.remoting.protobuf.annotation.ProtobufClass; import com.zfoo.protocol.IPacket; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ @ProtobufClass public class Heartbeat implements IPacket { @Ignore - public static final transient short PROTOCOL_ID = 102; + public static final short PROTOCOL_ID = 102; @Override public short protocolId() { 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 5f62535e..6f66ea7d 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 @@ -21,13 +21,13 @@ import com.zfoo.protocol.ProtocolManager; /** * 通用的返回，既可以用在远程调用，又可以嵌套在其它协议里 * - * @author jaysunxiao + * @author godotg * @version 3.0 */ @ProtobufClass public class Message implements IPacket { @Ignore - public static final transient short PROTOCOL_ID = 100; + public static final short PROTOCOL_ID = 100; public static final Message SUCCESS = valueSuccess(null); public static final Message FAIL = valueFail(null); 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 7cf4f900..51291219 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 @@ -20,12 +20,12 @@ import com.zfoo.protocol.IPacket; /** * Long + String * - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class PairLS implements IPacket { - public static final transient short PROTOCOL_ID = 113; + public static final short PROTOCOL_ID = 113; @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 c1870a8d..f1b4f5c5 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 @@ -20,12 +20,12 @@ import com.zfoo.protocol.IPacket; import java.util.Comparator; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class PairLong implements IPacket { - public static final transient short PROTOCOL_ID = 111; + public static final short PROTOCOL_ID = 111; public static transient final Comparator NATURAL_VALUE_COMPARATOR = (a, b) -> Long.compare(a.getValue(), b.getValue()); 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 83e30454..4ff26d13 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 @@ -16,12 +16,12 @@ package com.zfoo.net.packet.common; import com.zfoo.protocol.IPacket; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class PairString implements IPacket { - public static final transient short PROTOCOL_ID = 112; + public static final short PROTOCOL_ID = 112; 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 f2e56c30..c7d60812 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 @@ -18,14 +18,14 @@ import com.baidu.bjf.remoting.protobuf.annotation.ProtobufClass; import com.zfoo.protocol.IPacket; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ @ProtobufClass public class Ping implements IPacket { @Ignore - public static final transient short PROTOCOL_ID = 103; + public static final short PROTOCOL_ID = 103; @Override public short protocolId() { 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 0ae96238..9df4a762 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 @@ -19,14 +19,14 @@ import com.baidu.bjf.remoting.protobuf.annotation.ProtobufClass; import com.zfoo.protocol.IPacket; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ @ProtobufClass public class Pong implements IPacket { @Ignore - public static final transient short PROTOCOL_ID = 104; + public static final short PROTOCOL_ID = 104; /** * 服务器当前的时间戳 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 37ca4887..e7f7372b 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 @@ -18,12 +18,12 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.zfoo.protocol.IPacket; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class TripleLLS implements IPacket { - public static final transient short PROTOCOL_ID = 117; + public static final short PROTOCOL_ID = 117; @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 a0753c21..657d8502 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 @@ -20,12 +20,12 @@ import com.zfoo.protocol.IPacket; /** * Long + String + String * - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class TripleLSS implements IPacket { - public static final transient short PROTOCOL_ID = 116; + public static final short PROTOCOL_ID = 116; @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 9351db14..1f362559 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 @@ -18,12 +18,12 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.zfoo.protocol.IPacket; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class TripleLong implements IPacket { - public static final transient short PROTOCOL_ID = 114; + public static final short PROTOCOL_ID = 114; @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 687ac2fb..f859dfff 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 @@ -16,12 +16,12 @@ package com.zfoo.net.packet.common; import com.zfoo.protocol.IPacket; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public class TripleString implements IPacket { - public static final transient short PROTOCOL_ID = 115; + public static final short PROTOCOL_ID = 115; private String left; private String middle; 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 212fcf56..2e62b93e 100644 --- a/net/src/main/java/com/zfoo/net/router/Router.java +++ b/net/src/main/java/com/zfoo/net/router/Router.java @@ -19,9 +19,9 @@ import com.zfoo.net.core.event.ServerExceptionEvent; 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.common.Error; import com.zfoo.net.packet.common.Heartbeat; -import com.zfoo.net.packet.model.EncodedPacketInfo; import com.zfoo.net.router.answer.AsyncAnswer; import com.zfoo.net.router.answer.SyncAnswer; import com.zfoo.net.router.attachment.GatewayAttachment; 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 4830c6ce..4ef4e907 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,7 +14,7 @@ package com.zfoo.net.router.route; import com.zfoo.event.model.event.IEvent; -import com.zfoo.net.packet.service.PacketService; +import com.zfoo.net.packet.PacketService; import com.zfoo.net.router.attachment.GatewayAttachment; import com.zfoo.net.router.attachment.HttpAttachment; import com.zfoo.net.router.attachment.IAttachment; diff --git a/net/src/main/java/com/zfoo/net/schema/NetDefinitionParser.java b/net/src/main/java/com/zfoo/net/schema/NetDefinitionParser.java index 3d3ee73f..f3ed6f87 100644 --- a/net/src/main/java/com/zfoo/net/schema/NetDefinitionParser.java +++ b/net/src/main/java/com/zfoo/net/schema/NetDefinitionParser.java @@ -17,7 +17,7 @@ import com.zfoo.net.NetContext; import com.zfoo.net.config.ConfigManager; import com.zfoo.net.config.model.*; import com.zfoo.net.consumer.Consumer; -import com.zfoo.net.packet.service.PacketService; +import com.zfoo.net.packet.PacketService; import com.zfoo.net.router.Router; import com.zfoo.net.session.SessionManager; import com.zfoo.protocol.util.DomUtils; diff --git a/net/src/main/java/com/zfoo/net/util/SessionUtils.java b/net/src/main/java/com/zfoo/net/util/SessionUtils.java index 3069ce74..802d1533 100644 --- a/net/src/main/java/com/zfoo/net/util/SessionUtils.java +++ b/net/src/main/java/com/zfoo/net/util/SessionUtils.java @@ -21,7 +21,7 @@ import io.netty.channel.ChannelHandlerContext; import static com.zfoo.net.handler.BaseRouteHandler.SESSION_KEY; /** - * @author jaysunxiao + * @author godotg * @version 3.0 */ public abstract class SessionUtils { diff --git a/net/src/test/java/com/zfoo/net/core/http/HttpServerTest.java b/net/src/test/java/com/zfoo/net/core/http/HttpServerTest.java index d16ca874..7ba8892a 100644 --- a/net/src/test/java/com/zfoo/net/core/http/HttpServerTest.java +++ b/net/src/test/java/com/zfoo/net/core/http/HttpServerTest.java @@ -13,8 +13,8 @@ package com.zfoo.net.core.http; +import com.zfoo.net.packet.DecodedPacketInfo; import com.zfoo.net.packet.http.HttpHelloRequest; -import com.zfoo.net.packet.model.DecodedPacketInfo; import com.zfoo.net.router.attachment.HttpAttachment; import com.zfoo.protocol.exception.RunException; import com.zfoo.protocol.util.StringUtils; diff --git a/net/src/test/java/com/zfoo/net/core/tcpAsync/server/TcpServerTest.java b/net/src/test/java/com/zfoo/net/core/tcpAsync/server/TcpServerTest.java index 49a61111..14da463e 100644 --- a/net/src/test/java/com/zfoo/net/core/tcpAsync/server/TcpServerTest.java +++ b/net/src/test/java/com/zfoo/net/core/tcpAsync/server/TcpServerTest.java @@ -74,7 +74,7 @@ org.springframework.context.event.internalEventListenerFactory com.zfoo.net.config.model.NetConfig com.zfoo.net.NetContext com.zfoo.net.config.ConfigManager -com.zfoo.net.packet.service.PacketService +com.zfoo.net.packet.PacketService com.zfoo.net.router.Router com.zfoo.net.consumer.Consumer com.zfoo.net.session.SessionManager 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 a4d74660..1d143b12 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 @@ -23,7 +23,7 @@ import java.util.Arrays; */ public class CM_Array implements IPacket { - public static final transient short PROTOCOL_ID = 1119; + public static final short PROTOCOL_ID = 1119; 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 205fb2ba..eeba0106 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 @@ -23,7 +23,7 @@ import java.util.Objects; */ public class CM_Float implements IPacket { - public static final transient short PROTOCOL_ID = 1112; + public static final short PROTOCOL_ID = 1112; 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 83ecf61e..4296da30 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 @@ -23,7 +23,7 @@ import java.util.Objects; */ public class CM_Int implements IPacket { - public static final transient short PROTOCOL_ID = 1110; + public static final short PROTOCOL_ID = 1110; 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 b75143d4..c465ba46 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 @@ -25,7 +25,7 @@ import java.util.Objects; */ public class CM_List implements IPacket { - public static final transient short PROTOCOL_ID = 1118; + public static final short PROTOCOL_ID = 1118; 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 05ef3f4b..9f8e4de7 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 @@ -25,7 +25,7 @@ import java.util.Objects; */ public class CM_Map implements IPacket { - public static final transient short PROTOCOL_ID = 1120; + public static final short PROTOCOL_ID = 1120; 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 54630748..562515f8 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 @@ -23,7 +23,7 @@ import java.util.Objects; */ public class CM_Object implements IPacket { - public static final transient short PROTOCOL_ID = 1114; + public static final short PROTOCOL_ID = 1114; 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 15d829a6..54055270 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 @@ -26,7 +26,7 @@ import java.util.Set; */ public class CM_Set implements IPacket { - public static final transient short PROTOCOL_ID = 1121; + public static final short PROTOCOL_ID = 1121; 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 3c1cc543..704ce1df 100644 --- a/net/src/test/java/com/zfoo/net/packet/ObjectA.java +++ b/net/src/test/java/com/zfoo/net/packet/ObjectA.java @@ -23,7 +23,7 @@ import java.util.Objects; */ public class ObjectA implements IPacket { - public static final transient short PROTOCOL_ID = 1116; + public static final short PROTOCOL_ID = 1116; 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 67c85ace..0bee7007 100644 --- a/net/src/test/java/com/zfoo/net/packet/ObjectB.java +++ b/net/src/test/java/com/zfoo/net/packet/ObjectB.java @@ -23,7 +23,7 @@ import java.util.Objects; */ public class ObjectB implements IPacket { - public static final transient short PROTOCOL_ID = 1117; + public static final short PROTOCOL_ID = 1117; 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 14ffc12e..480c9978 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 @@ -21,7 +21,7 @@ import com.zfoo.protocol.IPacket; */ public class SM_Float implements IPacket { - public static final transient short PROTOCOL_ID = 1113; + public static final short PROTOCOL_ID = 1113; @Override 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 90630f77..63212598 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 @@ -23,7 +23,7 @@ import java.util.Objects; */ public class SM_Int implements IPacket { - public static final transient short PROTOCOL_ID = 1111; + public static final short PROTOCOL_ID = 1111; 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 6969423e..43e3af26 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 @@ -21,7 +21,7 @@ import com.zfoo.protocol.IPacket; */ public class SM_Object implements IPacket { - public static final transient short PROTOCOL_ID = 1115; + public static final short PROTOCOL_ID = 1115; @Override 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 b9bc504e..0d7f0243 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 @@ -25,7 +25,7 @@ import java.util.Set; */ public class CM_CSharpRequest implements IPacket { - public static final transient short PROTOCOL_ID = 1165; + public static final short PROTOCOL_ID = 1165; // 注释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 40ccda3a..c38dbe80 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 @@ -21,7 +21,7 @@ import com.zfoo.protocol.IPacket; */ public class CSharpObjectA implements IPacket { - public static final transient short PROTOCOL_ID = 1166; + public static final short PROTOCOL_ID = 1166; 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 1a72f3b7..eee17da2 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 @@ -21,7 +21,7 @@ import com.zfoo.protocol.IPacket; */ public class CSharpObjectB implements IPacket { - public static final transient short PROTOCOL_ID = 1167; + public static final short PROTOCOL_ID = 1167; 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 44e2bf47..6e5a12fa 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 @@ -21,7 +21,7 @@ import com.zfoo.protocol.IPacket; */ public class GatewayToProviderRequest implements IPacket { - public static final transient short PROTOCOL_ID = 5000; + public static final short PROTOCOL_ID = 5000; 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 547923bc..bda4b4ff 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 @@ -21,7 +21,7 @@ import com.zfoo.protocol.IPacket; */ public class GatewayToProviderResponse implements IPacket { - public static final transient short PROTOCOL_ID = 5001; + public static final short PROTOCOL_ID = 5001; 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 709c779d..70f76ffb 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 @@ -20,7 +20,7 @@ import com.zfoo.protocol.IPacket; */ public class HttpHelloRequest implements IPacket { - public static final transient short PROTOCOL_ID = 1700; + public static final short PROTOCOL_ID = 1700; 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 c767ed94..621f3182 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 @@ -20,7 +20,7 @@ import com.zfoo.protocol.IPacket; */ public class HttpHelloResponse implements IPacket { - public static final transient short PROTOCOL_ID = 1701; + public static final short PROTOCOL_ID = 1701; 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 47f8ca9d..013d2b15 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 @@ -21,7 +21,7 @@ import com.zfoo.protocol.IPacket; */ public class JProtobufHelloRequest implements IPacket { - public static final transient short PROTOCOL_ID = 1500; + public static final short PROTOCOL_ID = 1500; @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 804c07d0..e0ec69c7 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 @@ -21,7 +21,7 @@ import com.zfoo.protocol.IPacket; */ public class JProtobufHelloResponse implements IPacket { - public static final transient short PROTOCOL_ID = 1501; + public static final short PROTOCOL_ID = 1501; @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 f9efeb94..aaaa11c3 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 @@ -20,7 +20,7 @@ import com.zfoo.protocol.IPacket; */ public class JsonHelloRequest implements IPacket { - public static final transient short PROTOCOL_ID = 1600; + public static final short PROTOCOL_ID = 1600; 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 57102f33..7fbb3320 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 @@ -20,7 +20,7 @@ import com.zfoo.protocol.IPacket; */ public class JsonHelloResponse implements IPacket { - public static final transient short PROTOCOL_ID = 1601; + public static final short PROTOCOL_ID = 1601; 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 0ff37a70..2668327b 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 @@ -21,7 +21,7 @@ import com.zfoo.protocol.IPacket; */ public class ProviderMessAnswer implements IPacket { - public static final transient short PROTOCOL_ID = 4001; + public static final short PROTOCOL_ID = 4001; private String message; diff --git a/net/src/test/java/com/zfoo/net/packet/provider/ProviderMessAsk.java b/net/src/test/java/com/zfoo/net/packet/provider/ProviderMessAsk.java index 13f41969..c01be349 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 @@ -21,7 +21,7 @@ import com.zfoo.protocol.IPacket; */ public class ProviderMessAsk implements IPacket { - public static final transient short PROTOCOL_ID = 4000; + public static final short PROTOCOL_ID = 4000; 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 9c27ef6d..9c7d4136 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 @@ -20,7 +20,7 @@ import com.zfoo.protocol.IPacket; */ public class AsyncMessAnswer implements IPacket { - public static final transient short PROTOCOL_ID = 1153; + public static final short PROTOCOL_ID = 1153; 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 352b8a8a..4eac087f 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 @@ -20,7 +20,7 @@ import com.zfoo.protocol.IPacket; */ public class AsyncMessAsk implements IPacket { - public static final transient short PROTOCOL_ID = 1152; + public static final short PROTOCOL_ID = 1152; 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 7a7add86..fec80ab3 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 @@ -20,7 +20,7 @@ import com.zfoo.protocol.IPacket; */ public class SyncMessAnswer implements IPacket { - public static final transient short PROTOCOL_ID = 1151; + public static final short PROTOCOL_ID = 1151; 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 ac35b1a2..a266db55 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 @@ -20,7 +20,7 @@ import com.zfoo.protocol.IPacket; */ public class SyncMessAsk implements IPacket { - public static final transient short PROTOCOL_ID = 1150; + public static final short PROTOCOL_ID = 1150; 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 38e4a771..dcc4579d 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 @@ -20,7 +20,7 @@ import com.zfoo.protocol.IPacket; */ public class TcpHelloRequest implements IPacket { - public static final transient short PROTOCOL_ID = 1300; + public static final short PROTOCOL_ID = 1300; private 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 cf782b39..374c9832 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 @@ -20,7 +20,7 @@ import com.zfoo.protocol.IPacket; */ public class TcpHelloResponse implements IPacket { - public static final transient short PROTOCOL_ID = 1301; + public static final short PROTOCOL_ID = 1301; 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 7a98d820..21e6b196 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 @@ -20,7 +20,7 @@ import com.zfoo.protocol.IPacket; */ public class UdpHelloRequest implements IPacket { - public static final transient short PROTOCOL_ID = 1200; + public static final short PROTOCOL_ID = 1200; private String message; diff --git a/net/src/test/java/com/zfoo/net/packet/udp/UdpHelloResponse.java b/net/src/test/java/com/zfoo/net/packet/udp/UdpHelloResponse.java index 49bd61e5..945e596c 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 @@ -20,7 +20,7 @@ import com.zfoo.protocol.IPacket; */ public class UdpHelloResponse implements IPacket { - public static final transient short PROTOCOL_ID = 1201; + public static final short PROTOCOL_ID = 1201; private String message; diff --git a/net/src/test/java/com/zfoo/net/packet/websocket/WebSocketObjectA.java b/net/src/test/java/com/zfoo/net/packet/websocket/WebSocketObjectA.java index c9e94ba9..1c5d7003 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 @@ -23,7 +23,7 @@ import java.util.Objects; */ public class WebSocketObjectA implements IPacket { - public static final transient short PROTOCOL_ID = 2071; + public static final short PROTOCOL_ID = 2071; 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 b5f209bd..65122a39 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 @@ -23,7 +23,7 @@ import java.util.Objects; */ public class WebSocketObjectB implements IPacket { - public static final transient short PROTOCOL_ID = 2072; + public static final short PROTOCOL_ID = 2072; 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 668aabc0..beac03c1 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 @@ -25,7 +25,7 @@ import java.util.Set; */ public class WebSocketPacketRequest implements IPacket { - public static final transient short PROTOCOL_ID = 2070; + public static final short PROTOCOL_ID = 2070; 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 e9b06bd2..726405f1 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 @@ -20,7 +20,7 @@ import com.zfoo.protocol.IPacket; */ public class WebsocketHelloRequest implements IPacket { - public static final transient short PROTOCOL_ID = 1400; + public static final short PROTOCOL_ID = 1400; 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 304894b2..eb8fb489 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 @@ -20,7 +20,7 @@ import com.zfoo.protocol.IPacket; */ public class WebsocketHelloResponse implements IPacket { - public static final transient short PROTOCOL_ID = 1401; + public static final short PROTOCOL_ID = 1401; private String message; diff --git a/net/src/test/java/com/zfoo/net/protocol/ProtocolTest.java b/net/src/test/java/com/zfoo/net/protocol/ProtocolTest.java index 60e38980..ee1ebe94 100644 --- a/net/src/test/java/com/zfoo/net/protocol/ProtocolTest.java +++ b/net/src/test/java/com/zfoo/net/protocol/ProtocolTest.java @@ -15,9 +15,6 @@ package com.zfoo.net.protocol; import com.zfoo.net.NetContext; import com.zfoo.net.packet.*; -import com.zfoo.net.packet.model.DecodedPacketInfo; -import com.zfoo.net.packet.service.IPacketService; -import com.zfoo.net.packet.service.PacketService; import com.zfoo.net.router.attachment.SignalAttachment; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/net/src/test/resources/protocol.xml b/net/src/test/resources/protocol.xml index ba19acac..d2fbfb69 100644 --- a/net/src/test/resources/protocol.xml +++ b/net/src/test/resources/protocol.xml @@ -1,7 +1,7 @@ - +