From 972b42f3c2201312c7a4a6392ffe0ddae724dca5 Mon Sep 17 00:00:00 2001 From: sun Date: Tue, 5 Sep 2023 11:40:56 +0800 Subject: [PATCH] ref[net]: refactor net and move PacketReceiver to anno package --- .../com/zfoo/net/{router/receiver => anno}/PacketReceiver.java | 2 +- net/src/main/java/com/zfoo/net/router/route/PacketBus.java | 2 +- .../java/com/zfoo/net/core/csharp/ServerPacketController.java | 2 +- .../com/zfoo/net/core/gateway/GatewayProviderController.java | 2 +- .../test/java/com/zfoo/net/core/http/HttpServerController.java | 2 +- .../net/core/jprotobuf/client/JProtobufTcpClientController.java | 2 +- .../zfoo/net/core/jprotobuf/server/JProtobufTcpController.java | 2 +- .../com/zfoo/net/core/json/client/JsonWsClientController.java | 2 +- .../com/zfoo/net/core/json/server/JsonWsServerController.java | 2 +- .../java/com/zfoo/net/core/provider/ProviderController.java | 2 +- .../java/com/zfoo/net/core/tcp/client/TcpClientController.java | 2 +- .../java/com/zfoo/net/core/tcp/server/TcpServerController.java | 2 +- .../com/zfoo/net/core/tcpAsync/server/TcpAsyncController.java | 2 +- .../com/zfoo/net/core/tcpSync/server/TcpSyncController.java | 2 +- .../com/zfoo/net/core/udp/client/UdpClientPacketController.java | 2 +- .../com/zfoo/net/core/udp/server/UdpServerPacketController.java | 2 +- .../core/websocket/client/WebsocketClientPacketController.java | 2 +- .../core/websocket/server/WebsocketServerPacketController.java | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) rename net/src/main/java/com/zfoo/net/{router/receiver => anno}/PacketReceiver.java (95%) diff --git a/net/src/main/java/com/zfoo/net/router/receiver/PacketReceiver.java b/net/src/main/java/com/zfoo/net/anno/PacketReceiver.java similarity index 95% rename from net/src/main/java/com/zfoo/net/router/receiver/PacketReceiver.java rename to net/src/main/java/com/zfoo/net/anno/PacketReceiver.java index bacbf4e1..3a217c23 100644 --- a/net/src/main/java/com/zfoo/net/router/receiver/PacketReceiver.java +++ b/net/src/main/java/com/zfoo/net/anno/PacketReceiver.java @@ -11,7 +11,7 @@ * */ -package com.zfoo.net.router.receiver; +package com.zfoo.net.anno; import java.lang.annotation.*; 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 1b46bf09..432a9460 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 @@ -20,7 +20,7 @@ import com.zfoo.net.router.attachment.IAttachment; import com.zfoo.net.router.attachment.SignalAttachment; import com.zfoo.net.router.receiver.EnhanceUtils; import com.zfoo.net.router.receiver.IPacketReceiver; -import com.zfoo.net.router.receiver.PacketReceiver; +import com.zfoo.net.anno.PacketReceiver; import com.zfoo.net.router.receiver.PacketReceiverDefinition; import com.zfoo.net.session.Session; import com.zfoo.protocol.ProtocolManager; diff --git a/net/src/test/java/com/zfoo/net/core/csharp/ServerPacketController.java b/net/src/test/java/com/zfoo/net/core/csharp/ServerPacketController.java index aee6701a..889f096f 100644 --- a/net/src/test/java/com/zfoo/net/core/csharp/ServerPacketController.java +++ b/net/src/test/java/com/zfoo/net/core/csharp/ServerPacketController.java @@ -15,7 +15,7 @@ package com.zfoo.net.core.csharp; import com.zfoo.net.NetContext; import com.zfoo.net.packet.csharp.CM_CSharpRequest; -import com.zfoo.net.router.receiver.PacketReceiver; +import com.zfoo.net.anno.PacketReceiver; import com.zfoo.net.session.Session; import com.zfoo.protocol.util.JsonUtils; import org.springframework.stereotype.Component; diff --git a/net/src/test/java/com/zfoo/net/core/gateway/GatewayProviderController.java b/net/src/test/java/com/zfoo/net/core/gateway/GatewayProviderController.java index 59ad497e..7ed455e3 100644 --- a/net/src/test/java/com/zfoo/net/core/gateway/GatewayProviderController.java +++ b/net/src/test/java/com/zfoo/net/core/gateway/GatewayProviderController.java @@ -16,7 +16,7 @@ import com.zfoo.net.NetContext; import com.zfoo.net.packet.gateway.GatewayToProviderRequest; import com.zfoo.net.packet.gateway.GatewayToProviderResponse; import com.zfoo.net.router.attachment.GatewayAttachment; -import com.zfoo.net.router.receiver.PacketReceiver; +import com.zfoo.net.anno.PacketReceiver; import com.zfoo.net.session.Session; import com.zfoo.protocol.util.JsonUtils; import com.zfoo.protocol.util.StringUtils; diff --git a/net/src/test/java/com/zfoo/net/core/http/HttpServerController.java b/net/src/test/java/com/zfoo/net/core/http/HttpServerController.java index 289029e8..3e25fe7a 100644 --- a/net/src/test/java/com/zfoo/net/core/http/HttpServerController.java +++ b/net/src/test/java/com/zfoo/net/core/http/HttpServerController.java @@ -16,7 +16,7 @@ import com.zfoo.net.NetContext; import com.zfoo.net.packet.http.HttpHelloRequest; import com.zfoo.net.packet.http.HttpHelloResponse; import com.zfoo.net.router.attachment.HttpAttachment; -import com.zfoo.net.router.receiver.PacketReceiver; +import com.zfoo.net.anno.PacketReceiver; import com.zfoo.net.session.Session; import com.zfoo.protocol.util.JsonUtils; import org.slf4j.Logger; diff --git a/net/src/test/java/com/zfoo/net/core/jprotobuf/client/JProtobufTcpClientController.java b/net/src/test/java/com/zfoo/net/core/jprotobuf/client/JProtobufTcpClientController.java index e83d5233..1f5f7b74 100644 --- a/net/src/test/java/com/zfoo/net/core/jprotobuf/client/JProtobufTcpClientController.java +++ b/net/src/test/java/com/zfoo/net/core/jprotobuf/client/JProtobufTcpClientController.java @@ -13,7 +13,7 @@ package com.zfoo.net.core.jprotobuf.client; import com.zfoo.net.packet.jprotobuf.JProtobufHelloResponse; -import com.zfoo.net.router.receiver.PacketReceiver; +import com.zfoo.net.anno.PacketReceiver; import com.zfoo.net.session.Session; import com.zfoo.protocol.util.JsonUtils; import org.slf4j.Logger; diff --git a/net/src/test/java/com/zfoo/net/core/jprotobuf/server/JProtobufTcpController.java b/net/src/test/java/com/zfoo/net/core/jprotobuf/server/JProtobufTcpController.java index 55c00eb6..15889ad8 100644 --- a/net/src/test/java/com/zfoo/net/core/jprotobuf/server/JProtobufTcpController.java +++ b/net/src/test/java/com/zfoo/net/core/jprotobuf/server/JProtobufTcpController.java @@ -15,7 +15,7 @@ package com.zfoo.net.core.jprotobuf.server; import com.zfoo.net.NetContext; import com.zfoo.net.packet.jprotobuf.JProtobufHelloRequest; import com.zfoo.net.packet.jprotobuf.JProtobufHelloResponse; -import com.zfoo.net.router.receiver.PacketReceiver; +import com.zfoo.net.anno.PacketReceiver; import com.zfoo.net.session.Session; import com.zfoo.protocol.util.JsonUtils; import org.slf4j.Logger; diff --git a/net/src/test/java/com/zfoo/net/core/json/client/JsonWsClientController.java b/net/src/test/java/com/zfoo/net/core/json/client/JsonWsClientController.java index 6fab5471..df4a3143 100644 --- a/net/src/test/java/com/zfoo/net/core/json/client/JsonWsClientController.java +++ b/net/src/test/java/com/zfoo/net/core/json/client/JsonWsClientController.java @@ -14,7 +14,7 @@ package com.zfoo.net.core.json.client; import com.zfoo.net.packet.json.JsonHelloResponse; -import com.zfoo.net.router.receiver.PacketReceiver; +import com.zfoo.net.anno.PacketReceiver; import com.zfoo.net.session.Session; import com.zfoo.protocol.util.JsonUtils; import org.slf4j.Logger; diff --git a/net/src/test/java/com/zfoo/net/core/json/server/JsonWsServerController.java b/net/src/test/java/com/zfoo/net/core/json/server/JsonWsServerController.java index 3784f9d7..b1759fc9 100644 --- a/net/src/test/java/com/zfoo/net/core/json/server/JsonWsServerController.java +++ b/net/src/test/java/com/zfoo/net/core/json/server/JsonWsServerController.java @@ -16,7 +16,7 @@ package com.zfoo.net.core.json.server; import com.zfoo.net.NetContext; import com.zfoo.net.packet.json.JsonHelloRequest; import com.zfoo.net.packet.json.JsonHelloResponse; -import com.zfoo.net.router.receiver.PacketReceiver; +import com.zfoo.net.anno.PacketReceiver; import com.zfoo.net.session.Session; import com.zfoo.protocol.util.JsonUtils; import org.slf4j.Logger; diff --git a/net/src/test/java/com/zfoo/net/core/provider/ProviderController.java b/net/src/test/java/com/zfoo/net/core/provider/ProviderController.java index 7c7c4946..d1a04d49 100644 --- a/net/src/test/java/com/zfoo/net/core/provider/ProviderController.java +++ b/net/src/test/java/com/zfoo/net/core/provider/ProviderController.java @@ -15,7 +15,7 @@ package com.zfoo.net.core.provider; import com.zfoo.net.NetContext; import com.zfoo.net.packet.provider.ProviderMessAnswer; import com.zfoo.net.packet.provider.ProviderMessAsk; -import com.zfoo.net.router.receiver.PacketReceiver; +import com.zfoo.net.anno.PacketReceiver; import com.zfoo.net.session.Session; import com.zfoo.protocol.util.JsonUtils; import com.zfoo.protocol.util.StringUtils; diff --git a/net/src/test/java/com/zfoo/net/core/tcp/client/TcpClientController.java b/net/src/test/java/com/zfoo/net/core/tcp/client/TcpClientController.java index 3e09ed73..314d8a62 100644 --- a/net/src/test/java/com/zfoo/net/core/tcp/client/TcpClientController.java +++ b/net/src/test/java/com/zfoo/net/core/tcp/client/TcpClientController.java @@ -14,7 +14,7 @@ package com.zfoo.net.core.tcp.client; import com.zfoo.net.packet.tcp.TcpHelloResponse; -import com.zfoo.net.router.receiver.PacketReceiver; +import com.zfoo.net.anno.PacketReceiver; import com.zfoo.net.session.Session; import com.zfoo.protocol.util.JsonUtils; import org.slf4j.Logger; diff --git a/net/src/test/java/com/zfoo/net/core/tcp/server/TcpServerController.java b/net/src/test/java/com/zfoo/net/core/tcp/server/TcpServerController.java index abe4108a..07d9ddf0 100644 --- a/net/src/test/java/com/zfoo/net/core/tcp/server/TcpServerController.java +++ b/net/src/test/java/com/zfoo/net/core/tcp/server/TcpServerController.java @@ -15,7 +15,7 @@ package com.zfoo.net.core.tcp.server; import com.zfoo.net.NetContext; import com.zfoo.net.packet.tcp.TcpHelloRequest; import com.zfoo.net.packet.tcp.TcpHelloResponse; -import com.zfoo.net.router.receiver.PacketReceiver; +import com.zfoo.net.anno.PacketReceiver; import com.zfoo.net.session.Session; import com.zfoo.protocol.util.JsonUtils; import org.slf4j.Logger; diff --git a/net/src/test/java/com/zfoo/net/core/tcpAsync/server/TcpAsyncController.java b/net/src/test/java/com/zfoo/net/core/tcpAsync/server/TcpAsyncController.java index fef49d5c..68016b65 100644 --- a/net/src/test/java/com/zfoo/net/core/tcpAsync/server/TcpAsyncController.java +++ b/net/src/test/java/com/zfoo/net/core/tcpAsync/server/TcpAsyncController.java @@ -15,7 +15,7 @@ package com.zfoo.net.core.tcpAsync.server; import com.zfoo.net.NetContext; import com.zfoo.net.packet.tcp.AsyncMessAnswer; import com.zfoo.net.packet.tcp.AsyncMessAsk; -import com.zfoo.net.router.receiver.PacketReceiver; +import com.zfoo.net.anno.PacketReceiver; import com.zfoo.net.session.Session; import com.zfoo.protocol.util.JsonUtils; import org.slf4j.Logger; diff --git a/net/src/test/java/com/zfoo/net/core/tcpSync/server/TcpSyncController.java b/net/src/test/java/com/zfoo/net/core/tcpSync/server/TcpSyncController.java index 95ee1eb4..b43f8785 100644 --- a/net/src/test/java/com/zfoo/net/core/tcpSync/server/TcpSyncController.java +++ b/net/src/test/java/com/zfoo/net/core/tcpSync/server/TcpSyncController.java @@ -15,7 +15,7 @@ package com.zfoo.net.core.tcpSync.server; import com.zfoo.net.NetContext; import com.zfoo.net.packet.tcp.SyncMessAnswer; import com.zfoo.net.packet.tcp.SyncMessAsk; -import com.zfoo.net.router.receiver.PacketReceiver; +import com.zfoo.net.anno.PacketReceiver; import com.zfoo.net.session.Session; import com.zfoo.protocol.util.JsonUtils; import org.slf4j.Logger; diff --git a/net/src/test/java/com/zfoo/net/core/udp/client/UdpClientPacketController.java b/net/src/test/java/com/zfoo/net/core/udp/client/UdpClientPacketController.java index d3538a28..c06bb58e 100644 --- a/net/src/test/java/com/zfoo/net/core/udp/client/UdpClientPacketController.java +++ b/net/src/test/java/com/zfoo/net/core/udp/client/UdpClientPacketController.java @@ -14,7 +14,7 @@ package com.zfoo.net.core.udp.client; import com.zfoo.net.packet.udp.UdpHelloResponse; import com.zfoo.net.router.attachment.UdpAttachment; -import com.zfoo.net.router.receiver.PacketReceiver; +import com.zfoo.net.anno.PacketReceiver; import com.zfoo.net.session.Session; import com.zfoo.protocol.util.JsonUtils; import org.slf4j.Logger; diff --git a/net/src/test/java/com/zfoo/net/core/udp/server/UdpServerPacketController.java b/net/src/test/java/com/zfoo/net/core/udp/server/UdpServerPacketController.java index 39c224a3..ff3a5b2b 100644 --- a/net/src/test/java/com/zfoo/net/core/udp/server/UdpServerPacketController.java +++ b/net/src/test/java/com/zfoo/net/core/udp/server/UdpServerPacketController.java @@ -16,7 +16,7 @@ import com.zfoo.net.NetContext; import com.zfoo.net.packet.udp.UdpHelloRequest; import com.zfoo.net.packet.udp.UdpHelloResponse; import com.zfoo.net.router.attachment.UdpAttachment; -import com.zfoo.net.router.receiver.PacketReceiver; +import com.zfoo.net.anno.PacketReceiver; import com.zfoo.net.session.Session; import com.zfoo.protocol.util.JsonUtils; import org.slf4j.Logger; diff --git a/net/src/test/java/com/zfoo/net/core/websocket/client/WebsocketClientPacketController.java b/net/src/test/java/com/zfoo/net/core/websocket/client/WebsocketClientPacketController.java index 3eae875d..046a1d47 100644 --- a/net/src/test/java/com/zfoo/net/core/websocket/client/WebsocketClientPacketController.java +++ b/net/src/test/java/com/zfoo/net/core/websocket/client/WebsocketClientPacketController.java @@ -14,7 +14,7 @@ package com.zfoo.net.core.websocket.client; import com.zfoo.net.packet.websocket.WebsocketHelloResponse; -import com.zfoo.net.router.receiver.PacketReceiver; +import com.zfoo.net.anno.PacketReceiver; import com.zfoo.net.session.Session; import com.zfoo.protocol.util.JsonUtils; import org.slf4j.Logger; diff --git a/net/src/test/java/com/zfoo/net/core/websocket/server/WebsocketServerPacketController.java b/net/src/test/java/com/zfoo/net/core/websocket/server/WebsocketServerPacketController.java index 1769c1bd..6db0402f 100644 --- a/net/src/test/java/com/zfoo/net/core/websocket/server/WebsocketServerPacketController.java +++ b/net/src/test/java/com/zfoo/net/core/websocket/server/WebsocketServerPacketController.java @@ -15,7 +15,7 @@ package com.zfoo.net.core.websocket.server; import com.zfoo.net.NetContext; import com.zfoo.net.packet.websocket.WebsocketHelloRequest; import com.zfoo.net.packet.websocket.WebsocketHelloResponse; -import com.zfoo.net.router.receiver.PacketReceiver; +import com.zfoo.net.anno.PacketReceiver; import com.zfoo.net.session.Session; import com.zfoo.protocol.util.JsonUtils; import org.slf4j.Logger;