From c003c9ffef9da8e1733805f492eb936d04599389 Mon Sep 17 00:00:00 2001 From: guide Date: Sun, 6 Mar 2022 19:02:51 +0800 Subject: [PATCH] =?UTF-8?q?[imporve]=E5=B7=A5=E5=85=B7=E7=B1=BB=E5=AE=8C?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../javaguide/extension/ExtensionLoader.java | 4 +-- .../javaguide/utils/CollectionUtil.java | 17 ++++++++++++ .../javaguide/utils/CollectionUtils.java | 19 ------------- .../github/javaguide/utils/StringUtil.java | 22 +++++++++++++++ .../github/javaguide/utils/StringUtils.java | 27 ------------------- ...yUtils.java => ThreadPoolFactoryUtil.java} | 4 +-- .../javaguide/config/CustomShutdownHook.java | 4 +-- .../loadbalance/AbstractLoadBalance.java | 4 +-- .../registry/zk/ZkServiceDiscoveryImpl.java | 4 +-- .../netty/server/NettyRpcServer.java | 4 +-- .../transport/socket/SocketRpcServer.java | 4 +-- 11 files changed, 53 insertions(+), 60 deletions(-) create mode 100644 rpc-framework-common/src/main/java/github/javaguide/utils/CollectionUtil.java delete mode 100644 rpc-framework-common/src/main/java/github/javaguide/utils/CollectionUtils.java create mode 100644 rpc-framework-common/src/main/java/github/javaguide/utils/StringUtil.java delete mode 100644 rpc-framework-common/src/main/java/github/javaguide/utils/StringUtils.java rename rpc-framework-common/src/main/java/github/javaguide/utils/concurrent/threadpool/{ThreadPoolFactoryUtils.java => ThreadPoolFactoryUtil.java} (98%) diff --git a/rpc-framework-common/src/main/java/github/javaguide/extension/ExtensionLoader.java b/rpc-framework-common/src/main/java/github/javaguide/extension/ExtensionLoader.java index 99f49cb..be16e90 100644 --- a/rpc-framework-common/src/main/java/github/javaguide/extension/ExtensionLoader.java +++ b/rpc-framework-common/src/main/java/github/javaguide/extension/ExtensionLoader.java @@ -1,6 +1,6 @@ package github.javaguide.extension; -import github.javaguide.utils.StringUtils; +import github.javaguide.utils.StringUtil; import lombok.extern.slf4j.Slf4j; import java.io.BufferedReader; @@ -52,7 +52,7 @@ public final class ExtensionLoader { } public T getExtension(String name) { - if (StringUtils.isBlank(name)) { + if (StringUtil.isBlank(name)) { throw new IllegalArgumentException("Extension name should not be null or empty."); } // firstly get from cache, if not hit, create one diff --git a/rpc-framework-common/src/main/java/github/javaguide/utils/CollectionUtil.java b/rpc-framework-common/src/main/java/github/javaguide/utils/CollectionUtil.java new file mode 100644 index 0000000..dc31981 --- /dev/null +++ b/rpc-framework-common/src/main/java/github/javaguide/utils/CollectionUtil.java @@ -0,0 +1,17 @@ +package github.javaguide.utils; + +import java.util.Collection; + +/** + * 集合工具类 + * + * @author zhanghua + * @createTime 2022/3/6 12:58 上午 + */ +public class CollectionUtil { + + public static boolean isEmpty(Collection c) { + return c == null || c.isEmpty(); + } + +} diff --git a/rpc-framework-common/src/main/java/github/javaguide/utils/CollectionUtils.java b/rpc-framework-common/src/main/java/github/javaguide/utils/CollectionUtils.java deleted file mode 100644 index 6db86aa..0000000 --- a/rpc-framework-common/src/main/java/github/javaguide/utils/CollectionUtils.java +++ /dev/null @@ -1,19 +0,0 @@ -package github.javaguide.utils; - -import java.util.Collection; - -/** - * @Description: - * @Author: zhanghua - * @Date: 2022/3/6 12:58 上午 - */ -public class CollectionUtils { - - public static boolean isEmpty(Collection coll) { - return coll == null || coll.isEmpty(); - } - - public static boolean isNotEmpty(Collection coll) { - return isEmpty(coll); - } -} diff --git a/rpc-framework-common/src/main/java/github/javaguide/utils/StringUtil.java b/rpc-framework-common/src/main/java/github/javaguide/utils/StringUtil.java new file mode 100644 index 0000000..97a3afd --- /dev/null +++ b/rpc-framework-common/src/main/java/github/javaguide/utils/StringUtil.java @@ -0,0 +1,22 @@ +package github.javaguide.utils; + +/** + * String 工具类 + * + * @author zhanghua + * @createTime 2022/3/6 12:58 上午 + */ +public class StringUtil { + + public static boolean isBlank(String s) { + if (s == null || s.length() == 0) { + return true; + } + for (int i = 0; i < s.length(); ++i) { + if (!Character.isWhitespace(s.charAt(i))) { + return false; + } + } + return true; + } +} diff --git a/rpc-framework-common/src/main/java/github/javaguide/utils/StringUtils.java b/rpc-framework-common/src/main/java/github/javaguide/utils/StringUtils.java deleted file mode 100644 index 2a64d35..0000000 --- a/rpc-framework-common/src/main/java/github/javaguide/utils/StringUtils.java +++ /dev/null @@ -1,27 +0,0 @@ -package github.javaguide.utils; - -/** - * @Description: - * @Author: zhanghua - * @Date: 2022/3/6 12:58 上午 - */ -public class StringUtils { - - public static boolean isBlank(String s){ - int strLen ; - if(s == null || (strLen = s.length()) == 0){ - return true; - } - for(int i = 0; i < strLen; ++i) { - if (!Character.isWhitespace(s.charAt(i))) { - return false; - } - } - return true; - } - - public static boolean isNotBlank(String s){ - return !isBlank(s); - } - -} diff --git a/rpc-framework-common/src/main/java/github/javaguide/utils/concurrent/threadpool/ThreadPoolFactoryUtils.java b/rpc-framework-common/src/main/java/github/javaguide/utils/concurrent/threadpool/ThreadPoolFactoryUtil.java similarity index 98% rename from rpc-framework-common/src/main/java/github/javaguide/utils/concurrent/threadpool/ThreadPoolFactoryUtils.java rename to rpc-framework-common/src/main/java/github/javaguide/utils/concurrent/threadpool/ThreadPoolFactoryUtil.java index 2708f39..016a61a 100644 --- a/rpc-framework-common/src/main/java/github/javaguide/utils/concurrent/threadpool/ThreadPoolFactoryUtils.java +++ b/rpc-framework-common/src/main/java/github/javaguide/utils/concurrent/threadpool/ThreadPoolFactoryUtil.java @@ -20,7 +20,7 @@ import java.util.concurrent.TimeUnit; * @createTime 2020年05月26日 16:00:00 */ @Slf4j -public final class ThreadPoolFactoryUtils { +public final class ThreadPoolFactoryUtil { /** * 通过 threadNamePrefix 来区分不同线程池（我们可以把相同 threadNamePrefix 的线程池看作是为同一业务场景服务）。 @@ -29,7 +29,7 @@ public final class ThreadPoolFactoryUtils { */ private static final Map THREAD_POOLS = new ConcurrentHashMap<>(); - private ThreadPoolFactoryUtils() { + private ThreadPoolFactoryUtil() { } diff --git a/rpc-framework-simple/src/main/java/github/javaguide/config/CustomShutdownHook.java b/rpc-framework-simple/src/main/java/github/javaguide/config/CustomShutdownHook.java index b126c72..eea8be1 100644 --- a/rpc-framework-simple/src/main/java/github/javaguide/config/CustomShutdownHook.java +++ b/rpc-framework-simple/src/main/java/github/javaguide/config/CustomShutdownHook.java @@ -2,7 +2,7 @@ package github.javaguide.config; import github.javaguide.registry.zk.util.CuratorUtils; import github.javaguide.remoting.transport.netty.server.NettyRpcServer; -import github.javaguide.utils.concurrent.threadpool.ThreadPoolFactoryUtils; +import github.javaguide.utils.concurrent.threadpool.ThreadPoolFactoryUtil; import lombok.extern.slf4j.Slf4j; import java.net.InetAddress; @@ -31,7 +31,7 @@ public class CustomShutdownHook { CuratorUtils.clearRegistry(CuratorUtils.getZkClient(), inetSocketAddress); } catch (UnknownHostException ignored) { } - ThreadPoolFactoryUtils.shutDownAllThreadPool(); + ThreadPoolFactoryUtil.shutDownAllThreadPool(); })); } } diff --git a/rpc-framework-simple/src/main/java/github/javaguide/loadbalance/AbstractLoadBalance.java b/rpc-framework-simple/src/main/java/github/javaguide/loadbalance/AbstractLoadBalance.java index 83e6a09..9febf6c 100644 --- a/rpc-framework-simple/src/main/java/github/javaguide/loadbalance/AbstractLoadBalance.java +++ b/rpc-framework-simple/src/main/java/github/javaguide/loadbalance/AbstractLoadBalance.java @@ -1,7 +1,7 @@ package github.javaguide.loadbalance; import github.javaguide.remoting.dto.RpcRequest; -import github.javaguide.utils.CollectionUtils; +import github.javaguide.utils.CollectionUtil; import java.util.List; @@ -14,7 +14,7 @@ import java.util.List; public abstract class AbstractLoadBalance implements LoadBalance { @Override public String selectServiceAddress(List serviceAddresses, RpcRequest rpcRequest) { - if (CollectionUtils.isEmpty(serviceAddresses)) { + if (CollectionUtil.isEmpty(serviceAddresses)) { return null; } if (serviceAddresses.size() == 1) { diff --git a/rpc-framework-simple/src/main/java/github/javaguide/registry/zk/ZkServiceDiscoveryImpl.java b/rpc-framework-simple/src/main/java/github/javaguide/registry/zk/ZkServiceDiscoveryImpl.java index 2d68c47..73d603a 100644 --- a/rpc-framework-simple/src/main/java/github/javaguide/registry/zk/ZkServiceDiscoveryImpl.java +++ b/rpc-framework-simple/src/main/java/github/javaguide/registry/zk/ZkServiceDiscoveryImpl.java @@ -7,7 +7,7 @@ import github.javaguide.loadbalance.LoadBalance; import github.javaguide.registry.ServiceDiscovery; import github.javaguide.registry.zk.util.CuratorUtils; import github.javaguide.remoting.dto.RpcRequest; -import github.javaguide.utils.CollectionUtils; +import github.javaguide.utils.CollectionUtil; import lombok.extern.slf4j.Slf4j; import org.apache.curator.framework.CuratorFramework; @@ -33,7 +33,7 @@ public class ZkServiceDiscoveryImpl implements ServiceDiscovery { String rpcServiceName = rpcRequest.getRpcServiceName(); CuratorFramework zkClient = CuratorUtils.getZkClient(); List serviceUrlList = CuratorUtils.getChildrenNodes(zkClient, rpcServiceName); - if (CollectionUtils.isEmpty(serviceUrlList)) { + if (CollectionUtil.isEmpty(serviceUrlList)) { throw new RpcException(RpcErrorMessageEnum.SERVICE_CAN_NOT_BE_FOUND, rpcServiceName); } // load balancing diff --git a/rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/netty/server/NettyRpcServer.java b/rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/netty/server/NettyRpcServer.java index bc90523..4287370 100644 --- a/rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/netty/server/NettyRpcServer.java +++ b/rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/netty/server/NettyRpcServer.java @@ -8,7 +8,7 @@ import github.javaguide.provider.impl.ZkServiceProviderImpl; import github.javaguide.remoting.transport.netty.codec.RpcMessageDecoder; import github.javaguide.remoting.transport.netty.codec.RpcMessageEncoder; import github.javaguide.utils.RuntimeUtil; -import github.javaguide.utils.concurrent.threadpool.ThreadPoolFactoryUtils; +import github.javaguide.utils.concurrent.threadpool.ThreadPoolFactoryUtil; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelInitializer; @@ -56,7 +56,7 @@ public class NettyRpcServer { EventLoopGroup workerGroup = new NioEventLoopGroup(); DefaultEventExecutorGroup serviceHandlerGroup = new DefaultEventExecutorGroup( RuntimeUtil.cpus() * 2, - ThreadPoolFactoryUtils.createThreadFactory("service-handler-group", false) + ThreadPoolFactoryUtil.createThreadFactory("service-handler-group", false) ); try { ServerBootstrap b = new ServerBootstrap(); diff --git a/rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/socket/SocketRpcServer.java b/rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/socket/SocketRpcServer.java index 1426569..d2e29e4 100644 --- a/rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/socket/SocketRpcServer.java +++ b/rpc-framework-simple/src/main/java/github/javaguide/remoting/transport/socket/SocketRpcServer.java @@ -5,7 +5,7 @@ import github.javaguide.config.RpcServiceConfig; import github.javaguide.factory.SingletonFactory; import github.javaguide.provider.ServiceProvider; import github.javaguide.provider.impl.ZkServiceProviderImpl; -import github.javaguide.utils.concurrent.threadpool.ThreadPoolFactoryUtils; +import github.javaguide.utils.concurrent.threadpool.ThreadPoolFactoryUtil; import lombok.extern.slf4j.Slf4j; import java.io.IOException; @@ -29,7 +29,7 @@ public class SocketRpcServer { public SocketRpcServer() { - threadPool = ThreadPoolFactoryUtils.createCustomThreadPoolIfAbsent("socket-server-rpc-pool"); + threadPool = ThreadPoolFactoryUtil.createCustomThreadPoolIfAbsent("socket-server-rpc-pool"); serviceProvider = SingletonFactory.getInstance(ZkServiceProviderImpl.class); } -- GitLab