From 34407b7e7a8343ec0778c7cd5915d97edf2545c5 Mon Sep 17 00:00:00 2001 From: "shuang.kou" Date: Wed, 3 Jun 2020 17:01:55 +0800 Subject: [PATCH] [v3.0]refractor package structure --- .../main/java/github/javaguide/NettyClientMain.java | 4 ++-- .../github/javaguide/RpcFrameworkSimpleClientMain.java | 4 ++-- .../main/java/github/javaguide/NettyServerMain.java | 2 +- .../github/javaguide/RpcFrameworkSimpleServerMain.java | 2 +- .../github/javaguide/handler/RpcRequestHandler.java | 4 ++-- .../java/github/javaguide/proxy/RpcClientProxy.java | 4 ++-- .../javaguide/remoting/dto}/RpcMessageChecker.java | 5 ++--- .../github/javaguide/remoting}/dto/RpcRequest.java | 2 +- .../github/javaguide/remoting}/dto/RpcResponse.java | 2 +- .../{ => remoting}/transport/ClientTransport.java | 4 ++-- .../transport/netty/client/ChannelProvider.java | 2 +- .../transport/netty/client/NettyClient.java | 10 +++++----- .../netty/client/NettyClientClientTransport.java | 10 +++++----- .../transport/netty/client/NettyClientHandler.java | 4 ++-- .../transport/netty/codec/kyro/NettyKryoDecoder.java | 2 +- .../transport/netty/codec/kyro/NettyKryoEncoder.java | 2 +- .../transport/netty/server/NettyServer.java | 10 +++++----- .../transport/netty/server/NettyServerHandler.java | 6 +++--- .../transport/socket/SocketRpcClient.java | 10 +++++----- .../socket/SocketRpcRequestHandlerRunnable.java | 6 +++--- .../transport/socket/SocketRpcServer.java | 2 +- .../javaguide/serialize/kyro/KryoSerializer.java | 4 ++-- 22 files changed, 50 insertions(+), 51 deletions(-) rename {rpc-framework-common/src/main/java/github/javaguide/utils/checker => rpc-framework-simple/src/main/java/github/javaguide/remoting/dto}/RpcMessageChecker.java (90%) rename {rpc-framework-common/src/main/java/github/javaguide => rpc-framework-simple/src/main/java/github/javaguide/remoting}/dto/RpcRequest.java (93%) rename {rpc-framework-common/src/main/java/github/javaguide => rpc-framework-simple/src/main/java/github/javaguide/remoting}/dto/RpcResponse.java (97%) rename rpc-framework-simple/src/main/java/github/javaguide/{ => remoting}/transport/ClientTransport.java (77%) rename rpc-framework-simple/src/main/java/github/javaguide/{ => remoting}/transport/netty/client/ChannelProvider.java (97%) rename rpc-framework-simple/src/main/java/github/javaguide/{ => remoting}/transport/netty/client/NettyClient.java (88%) rename rpc-framework-simple/src/main/java/github/javaguide/{ => remoting}/transport/netty/client/NettyClientClientTransport.java (88%) rename rpc-framework-simple/src/main/java/github/javaguide/{ => remoting}/transport/netty/client/NettyClientHandler.java (94%) rename rpc-framework-simple/src/main/java/github/javaguide/{ => remoting}/transport/netty/codec/kyro/NettyKryoDecoder.java (97%) rename rpc-framework-simple/src/main/java/github/javaguide/{ => remoting}/transport/netty/codec/kyro/NettyKryoEncoder.java (95%) rename rpc-framework-simple/src/main/java/github/javaguide/{ => remoting}/transport/netty/server/NettyServer.java (92%) rename rpc-framework-simple/src/main/java/github/javaguide/{ => remoting}/transport/netty/server/NettyServerHandler.java (94%) rename rpc-framework-simple/src/main/java/github/javaguide/{ => remoting}/transport/socket/SocketRpcClient.java (86%) rename rpc-framework-simple/src/main/java/github/javaguide/{ => remoting}/transport/socket/SocketRpcRequestHandlerRunnable.java (90%) rename rpc-framework-simple/src/main/java/github/javaguide/{ => remoting}/transport/socket/SocketRpcServer.java (97%) diff --git a/example-client/src/main/java/github/javaguide/NettyClientMain.java b/example-client/src/main/java/github/javaguide/NettyClientMain.java index 3143b71..f6cd77d 100644 --- a/example-client/src/main/java/github/javaguide/NettyClientMain.java +++ b/example-client/src/main/java/github/javaguide/NettyClientMain.java @@ -1,8 +1,8 @@ package github.javaguide; -import github.javaguide.transport.ClientTransport; +import github.javaguide.remoting.transport.ClientTransport; import github.javaguide.proxy.RpcClientProxy; -import github.javaguide.transport.netty.client.NettyClientClientTransport; +import github.javaguide.remoting.transport.netty.client.NettyClientClientTransport; /** * @author shuang.kou diff --git a/example-client/src/main/java/github/javaguide/RpcFrameworkSimpleClientMain.java b/example-client/src/main/java/github/javaguide/RpcFrameworkSimpleClientMain.java index d4f1357..d1e1aef 100644 --- a/example-client/src/main/java/github/javaguide/RpcFrameworkSimpleClientMain.java +++ b/example-client/src/main/java/github/javaguide/RpcFrameworkSimpleClientMain.java @@ -1,8 +1,8 @@ package github.javaguide; -import github.javaguide.transport.ClientTransport; +import github.javaguide.remoting.transport.ClientTransport; import github.javaguide.proxy.RpcClientProxy; -import github.javaguide.transport.socket.SocketRpcClient; +import github.javaguide.remoting.transport.socket.SocketRpcClient; /** * @author shuang.kou diff --git a/example-server/src/main/java/github/javaguide/NettyServerMain.java b/example-server/src/main/java/github/javaguide/NettyServerMain.java index bfb017b..b722316 100644 --- a/example-server/src/main/java/github/javaguide/NettyServerMain.java +++ b/example-server/src/main/java/github/javaguide/NettyServerMain.java @@ -1,6 +1,6 @@ package github.javaguide; -import github.javaguide.transport.netty.server.NettyServer; +import github.javaguide.remoting.transport.netty.server.NettyServer; /** * @author shuang.kou diff --git a/example-server/src/main/java/github/javaguide/RpcFrameworkSimpleServerMain.java b/example-server/src/main/java/github/javaguide/RpcFrameworkSimpleServerMain.java index 6e638d9..ef0a340 100644 --- a/example-server/src/main/java/github/javaguide/RpcFrameworkSimpleServerMain.java +++ b/example-server/src/main/java/github/javaguide/RpcFrameworkSimpleServerMain.java @@ -1,6 +1,6 @@ package github.javaguide; -import github.javaguide.transport.socket.SocketRpcServer; +import github.javaguide.remoting.transport.socket.SocketRpcServer; /** * @author shuang.kou diff --git a/rpc-framework-simple/src/main/java/github/javaguide/handler/RpcRequestHandler.java b/rpc-framework-simple/src/main/java/github/javaguide/handler/RpcRequestHandler.java index da630e9..cea78b8 100644 --- a/rpc-framework-simple/src/main/java/github/javaguide/handler/RpcRequestHandler.java +++ b/rpc-framework-simple/src/main/java/github/javaguide/handler/RpcRequestHandler.java @@ -1,7 +1,7 @@ package github.javaguide.handler; -import github.javaguide.dto.RpcRequest; -import github.javaguide.dto.RpcResponse; +import github.javaguide.remoting.dto.RpcRequest; +import github.javaguide.remoting.dto.RpcResponse; import github.javaguide.enumeration.RpcResponseCode; import github.javaguide.exception.RpcException; import github.javaguide.provider.ServiceProvider; diff --git a/rpc-framework-simple/src/main/java/github/javaguide/proxy/RpcClientProxy.java b/rpc-framework-simple/src/main/java/github/javaguide/proxy/RpcClientProxy.java index 33c3f46..6f84958 100644 --- a/rpc-framework-simple/src/main/java/github/javaguide/proxy/RpcClientProxy.java +++ b/rpc-framework-simple/src/main/java/github/javaguide/proxy/RpcClientProxy.java @@ -1,7 +1,7 @@ package github.javaguide.proxy; -import github.javaguide.dto.RpcRequest; -import github.javaguide.transport.ClientTransport; +import github.javaguide.remoting.dto.RpcRequest; +import github.javaguide.remoting.transport.ClientTransport; import lombok.extern.slf4j.Slf4j; import java.lang.reflect.InvocationHandler; diff --git a/rpc-framework-common/src/main/java/github/javaguide/utils/checker/RpcMessageChecker.java b/rpc-framework-simple/src/main/java/github/javaguide/remoting/dto/RpcMessageChecker.java similarity index 90% rename from rpc-framework-common/src/main/java/github/javaguide/utils/checker/RpcMessageChecker.java rename to rpc-framework-simple/src/main/java/github/javaguide/remoting/dto/RpcMessageChecker.java index 11cee5f..74297cd 100644 --- a/rpc-framework-common/src/main/java/github/javaguide/utils/checker/RpcMessageChecker.java +++ b/rpc-framework-simple/src/main/java/github/javaguide/remoting/dto/RpcMessageChecker.java @@ -1,7 +1,6 @@ -package github.javaguide.utils.checker; +package github.javaguide.remoting.dto; + -import github.javaguide.dto.RpcRequest; -import github.javaguide.dto.RpcResponse; import github.javaguide.enumeration.RpcErrorMessageEnum; import github.javaguide.enumeration.RpcResponseCode; import github.javaguide.exception.RpcException; diff --git a/rpc-framework-common/src/main/java/github/javaguide/dto/RpcRequest.java b/rpc-framework-simple/src/main/java/github/javaguide/remoting/dto/RpcRequest.java similarity index 93% rename from rpc-framework-common/src/main/java/github/javaguide/dto/RpcRequest.java rename to rpc-framework-simple/src/main/java/github/javaguide/remoting/dto/RpcRequest.java index fa5c48b..fba2cd9 100644 --- a/rpc-framework-common/src/main/java/github/javaguide/dto/RpcRequest.java +++ b/rpc-framework-simple/src/main/java/github/javaguide/remoting/dto/RpcRequest.java @@ -1,4 +1,4 @@ -package github.javaguide.dto; +package github.javaguide.remoting.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/rpc-framework-common/src/main/java/github/javaguide/dto/RpcResponse.java b/rpc-framework-simple/src/main/java/github/javaguide/remoting/dto/RpcResponse.java similarity index 97% rename from rpc-framework-common/src/main/java/github/javaguide/dto/RpcResponse.java rename to rpc-framework-simple/src/main/java/github/javaguide/remoting/dto/RpcResponse.java index 7f7cbd5..502934c 100644 --- a/rpc-framework-common/src/main/java/github/javaguide/dto/RpcResponse.java +++ b/rpc-framework-simple/src/main/java/github/javaguide/remoting/dto/RpcResponse.java @@ -1,4 +1,4 @@ -package github.javaguide.dto; +package github.javaguide.remoting.dto; import github.javaguide.enumeration.RpcResponseCode; import lombok.AllArgsConstructor; diff --git a/rpc-framework-simple/src/main/java/github/javaguide/transport/ClientTransport.java b/rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/ClientTransport.java similarity index 77% rename from rpc-framework-simple/src/main/java/github/javaguide/transport/ClientTransport.java rename to rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/ClientTransport.java index 8d7f960..6e57b56 100644 --- a/rpc-framework-simple/src/main/java/github/javaguide/transport/ClientTransport.java +++ b/rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/ClientTransport.java @@ -1,6 +1,6 @@ -package github.javaguide.transport; +package github.javaguide.remoting.transport; -import github.javaguide.dto.RpcRequest; +import github.javaguide.remoting.dto.RpcRequest; /** * 传输 RpcRequest。 diff --git a/rpc-framework-simple/src/main/java/github/javaguide/transport/netty/client/ChannelProvider.java b/rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/netty/client/ChannelProvider.java similarity index 97% rename from rpc-framework-simple/src/main/java/github/javaguide/transport/netty/client/ChannelProvider.java rename to rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/netty/client/ChannelProvider.java index 50ece7c..0f392ac 100644 --- a/rpc-framework-simple/src/main/java/github/javaguide/transport/netty/client/ChannelProvider.java +++ b/rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/netty/client/ChannelProvider.java @@ -1,4 +1,4 @@ -package github.javaguide.transport.netty.client; +package github.javaguide.remoting.transport.netty.client; import github.javaguide.enumeration.RpcErrorMessageEnum; import github.javaguide.exception.RpcException; diff --git a/rpc-framework-simple/src/main/java/github/javaguide/transport/netty/client/NettyClient.java b/rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/netty/client/NettyClient.java similarity index 88% rename from rpc-framework-simple/src/main/java/github/javaguide/transport/netty/client/NettyClient.java rename to rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/netty/client/NettyClient.java index 5ce825f..8ac973e 100644 --- a/rpc-framework-simple/src/main/java/github/javaguide/transport/netty/client/NettyClient.java +++ b/rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/netty/client/NettyClient.java @@ -1,10 +1,10 @@ -package github.javaguide.transport.netty.client; +package github.javaguide.remoting.transport.netty.client; -import github.javaguide.dto.RpcRequest; -import github.javaguide.dto.RpcResponse; +import github.javaguide.remoting.dto.RpcRequest; +import github.javaguide.remoting.dto.RpcResponse; import github.javaguide.serialize.kyro.KryoSerializer; -import github.javaguide.transport.netty.codec.kyro.NettyKryoDecoder; -import github.javaguide.transport.netty.codec.kyro.NettyKryoEncoder; +import github.javaguide.remoting.transport.netty.codec.kyro.NettyKryoDecoder; +import github.javaguide.remoting.transport.netty.codec.kyro.NettyKryoEncoder; import io.netty.bootstrap.Bootstrap; import io.netty.channel.ChannelInitializer; import io.netty.channel.ChannelOption; diff --git a/rpc-framework-simple/src/main/java/github/javaguide/transport/netty/client/NettyClientClientTransport.java b/rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/netty/client/NettyClientClientTransport.java similarity index 88% rename from rpc-framework-simple/src/main/java/github/javaguide/transport/netty/client/NettyClientClientTransport.java rename to rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/netty/client/NettyClientClientTransport.java index 7d15e20..a695f72 100644 --- a/rpc-framework-simple/src/main/java/github/javaguide/transport/netty/client/NettyClientClientTransport.java +++ b/rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/netty/client/NettyClientClientTransport.java @@ -1,11 +1,11 @@ -package github.javaguide.transport.netty.client; +package github.javaguide.remoting.transport.netty.client; -import github.javaguide.dto.RpcRequest; -import github.javaguide.dto.RpcResponse; +import github.javaguide.remoting.dto.RpcRequest; +import github.javaguide.remoting.dto.RpcResponse; import github.javaguide.registry.ServiceDiscovery; import github.javaguide.registry.ZkServiceDiscovery; -import github.javaguide.transport.ClientTransport; -import github.javaguide.utils.checker.RpcMessageChecker; +import github.javaguide.remoting.transport.ClientTransport; +import github.javaguide.remoting.dto.RpcMessageChecker; import io.netty.channel.Channel; import io.netty.channel.ChannelFutureListener; import io.netty.util.AttributeKey; diff --git a/rpc-framework-simple/src/main/java/github/javaguide/transport/netty/client/NettyClientHandler.java b/rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/netty/client/NettyClientHandler.java similarity index 94% rename from rpc-framework-simple/src/main/java/github/javaguide/transport/netty/client/NettyClientHandler.java rename to rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/netty/client/NettyClientHandler.java index b1f8fc1..063f80d 100644 --- a/rpc-framework-simple/src/main/java/github/javaguide/transport/netty/client/NettyClientHandler.java +++ b/rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/netty/client/NettyClientHandler.java @@ -1,6 +1,6 @@ -package github.javaguide.transport.netty.client; +package github.javaguide.remoting.transport.netty.client; -import github.javaguide.dto.RpcResponse; +import github.javaguide.remoting.dto.RpcResponse; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.channel.SimpleChannelInboundHandler; diff --git a/rpc-framework-simple/src/main/java/github/javaguide/transport/netty/codec/kyro/NettyKryoDecoder.java b/rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/netty/codec/kyro/NettyKryoDecoder.java similarity index 97% rename from rpc-framework-simple/src/main/java/github/javaguide/transport/netty/codec/kyro/NettyKryoDecoder.java rename to rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/netty/codec/kyro/NettyKryoDecoder.java index 5f38913..817fe3e 100644 --- a/rpc-framework-simple/src/main/java/github/javaguide/transport/netty/codec/kyro/NettyKryoDecoder.java +++ b/rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/netty/codec/kyro/NettyKryoDecoder.java @@ -1,4 +1,4 @@ -package github.javaguide.transport.netty.codec.kyro; +package github.javaguide.remoting.transport.netty.codec.kyro; import github.javaguide.serialize.Serializer; import io.netty.buffer.ByteBuf; diff --git a/rpc-framework-simple/src/main/java/github/javaguide/transport/netty/codec/kyro/NettyKryoEncoder.java b/rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/netty/codec/kyro/NettyKryoEncoder.java similarity index 95% rename from rpc-framework-simple/src/main/java/github/javaguide/transport/netty/codec/kyro/NettyKryoEncoder.java rename to rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/netty/codec/kyro/NettyKryoEncoder.java index 6bc76f3..20cec1a 100644 --- a/rpc-framework-simple/src/main/java/github/javaguide/transport/netty/codec/kyro/NettyKryoEncoder.java +++ b/rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/netty/codec/kyro/NettyKryoEncoder.java @@ -1,4 +1,4 @@ -package github.javaguide.transport.netty.codec.kyro; +package github.javaguide.remoting.transport.netty.codec.kyro; import github.javaguide.serialize.Serializer; import io.netty.buffer.ByteBuf; diff --git a/rpc-framework-simple/src/main/java/github/javaguide/transport/netty/server/NettyServer.java b/rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/netty/server/NettyServer.java similarity index 92% rename from rpc-framework-simple/src/main/java/github/javaguide/transport/netty/server/NettyServer.java rename to rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/netty/server/NettyServer.java index 9d38471..137b505 100644 --- a/rpc-framework-simple/src/main/java/github/javaguide/transport/netty/server/NettyServer.java +++ b/rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/netty/server/NettyServer.java @@ -1,14 +1,14 @@ -package github.javaguide.transport.netty.server; +package github.javaguide.remoting.transport.netty.server; -import github.javaguide.dto.RpcRequest; -import github.javaguide.dto.RpcResponse; +import github.javaguide.remoting.dto.RpcRequest; +import github.javaguide.remoting.dto.RpcResponse; import github.javaguide.provider.ServiceProvider; import github.javaguide.provider.ServiceProviderImpl; import github.javaguide.registry.ServiceRegistry; import github.javaguide.registry.ZkServiceRegistry; import github.javaguide.serialize.kyro.KryoSerializer; -import github.javaguide.transport.netty.codec.kyro.NettyKryoDecoder; -import github.javaguide.transport.netty.codec.kyro.NettyKryoEncoder; +import github.javaguide.remoting.transport.netty.codec.kyro.NettyKryoDecoder; +import github.javaguide.remoting.transport.netty.codec.kyro.NettyKryoEncoder; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelInitializer; diff --git a/rpc-framework-simple/src/main/java/github/javaguide/transport/netty/server/NettyServerHandler.java b/rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/netty/server/NettyServerHandler.java similarity index 94% rename from rpc-framework-simple/src/main/java/github/javaguide/transport/netty/server/NettyServerHandler.java rename to rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/netty/server/NettyServerHandler.java index 845a736..5d95498 100644 --- a/rpc-framework-simple/src/main/java/github/javaguide/transport/netty/server/NettyServerHandler.java +++ b/rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/netty/server/NettyServerHandler.java @@ -1,7 +1,7 @@ -package github.javaguide.transport.netty.server; +package github.javaguide.remoting.transport.netty.server; -import github.javaguide.dto.RpcRequest; -import github.javaguide.dto.RpcResponse; +import github.javaguide.remoting.dto.RpcRequest; +import github.javaguide.remoting.dto.RpcResponse; import github.javaguide.handler.RpcRequestHandler; import github.javaguide.utils.concurrent.ThreadPoolFactory; import github.javaguide.utils.factory.SingletonFactory; diff --git a/rpc-framework-simple/src/main/java/github/javaguide/transport/socket/SocketRpcClient.java b/rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/socket/SocketRpcClient.java similarity index 86% rename from rpc-framework-simple/src/main/java/github/javaguide/transport/socket/SocketRpcClient.java rename to rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/socket/SocketRpcClient.java index cf0454a..48bccfb 100644 --- a/rpc-framework-simple/src/main/java/github/javaguide/transport/socket/SocketRpcClient.java +++ b/rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/socket/SocketRpcClient.java @@ -1,12 +1,12 @@ -package github.javaguide.transport.socket; +package github.javaguide.remoting.transport.socket; -import github.javaguide.dto.RpcRequest; -import github.javaguide.dto.RpcResponse; +import github.javaguide.remoting.dto.RpcRequest; +import github.javaguide.remoting.dto.RpcResponse; import github.javaguide.exception.RpcException; import github.javaguide.registry.ServiceDiscovery; import github.javaguide.registry.ZkServiceDiscovery; -import github.javaguide.transport.ClientTransport; -import github.javaguide.utils.checker.RpcMessageChecker; +import github.javaguide.remoting.transport.ClientTransport; +import github.javaguide.remoting.dto.RpcMessageChecker; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/rpc-framework-simple/src/main/java/github/javaguide/transport/socket/SocketRpcRequestHandlerRunnable.java b/rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/socket/SocketRpcRequestHandlerRunnable.java similarity index 90% rename from rpc-framework-simple/src/main/java/github/javaguide/transport/socket/SocketRpcRequestHandlerRunnable.java rename to rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/socket/SocketRpcRequestHandlerRunnable.java index 7c1a0b9..935c0fd 100644 --- a/rpc-framework-simple/src/main/java/github/javaguide/transport/socket/SocketRpcRequestHandlerRunnable.java +++ b/rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/socket/SocketRpcRequestHandlerRunnable.java @@ -1,7 +1,7 @@ -package github.javaguide.transport.socket; +package github.javaguide.remoting.transport.socket; -import github.javaguide.dto.RpcRequest; -import github.javaguide.dto.RpcResponse; +import github.javaguide.remoting.dto.RpcRequest; +import github.javaguide.remoting.dto.RpcResponse; import github.javaguide.handler.RpcRequestHandler; import github.javaguide.utils.factory.SingletonFactory; import lombok.extern.slf4j.Slf4j; diff --git a/rpc-framework-simple/src/main/java/github/javaguide/transport/socket/SocketRpcServer.java b/rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/socket/SocketRpcServer.java similarity index 97% rename from rpc-framework-simple/src/main/java/github/javaguide/transport/socket/SocketRpcServer.java rename to rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/socket/SocketRpcServer.java index 1176797..7b1904d 100644 --- a/rpc-framework-simple/src/main/java/github/javaguide/transport/socket/SocketRpcServer.java +++ b/rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/socket/SocketRpcServer.java @@ -1,4 +1,4 @@ -package github.javaguide.transport.socket; +package github.javaguide.remoting.transport.socket; import github.javaguide.provider.ServiceProvider; import github.javaguide.provider.ServiceProviderImpl; diff --git a/rpc-framework-simple/src/main/java/github/javaguide/serialize/kyro/KryoSerializer.java b/rpc-framework-simple/src/main/java/github/javaguide/serialize/kyro/KryoSerializer.java index ca0beae..d81b2fe 100644 --- a/rpc-framework-simple/src/main/java/github/javaguide/serialize/kyro/KryoSerializer.java +++ b/rpc-framework-simple/src/main/java/github/javaguide/serialize/kyro/KryoSerializer.java @@ -3,8 +3,8 @@ package github.javaguide.serialize.kyro; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; -import github.javaguide.dto.RpcRequest; -import github.javaguide.dto.RpcResponse; +import github.javaguide.remoting.dto.RpcRequest; +import github.javaguide.remoting.dto.RpcResponse; import github.javaguide.exception.SerializeException; import github.javaguide.serialize.Serializer; import lombok.extern.slf4j.Slf4j; -- GitLab