From 773983df7f7e209306e1ff23ee9649a5562b2027 Mon Sep 17 00:00:00 2001 From: DDDreame Date: Fri, 5 May 2023 23:51:50 +0800 Subject: [PATCH] fix all ConstantName style error. Constant names are required to be written in uppercase letters and separated by underscores --- .../common/extension/support/ExtensionInvoker.java | 4 ++-- .../java/cn/hippo4j/rpc/discovery/ClassRegistry.java | 10 +++++----- .../cn/hippo4j/rpc/support/NettyClientSupport.java | 6 +++--- .../java/cn/hippo4j/rpc/support/ResultHolder.java | 12 ++++++------ 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/extension/support/ExtensionInvoker.java b/hippo4j-common/src/main/java/cn/hippo4j/common/extension/support/ExtensionInvoker.java index 0c748680..24d0465a 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/extension/support/ExtensionInvoker.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/extension/support/ExtensionInvoker.java @@ -33,7 +33,7 @@ import java.util.List; */ public class ExtensionInvoker { - private static final ExtensionRegistry registry = ExtensionRegistry.getInstance(); + private static final ExtensionRegistry REGISTRY = ExtensionRegistry.getInstance(); public static List reduceExecute(Class targetClz, ExtensionCallback callback) { @@ -47,7 +47,7 @@ public class ExtensionInvoker { Assert.isTrue(IExtension.class.isAssignableFrom(targetClz), "can not execute extension point. please implement base extension interface(" + IExtension.class.getName() + ") first."); - List realizations = registry.find(targetClz); + List realizations = REGISTRY.find(targetClz); if (CollectionUtil.isEmpty(realizations)) { realizations = new ArrayList<>(ServiceLoaderRegistry.getSingletonServiceInstances(targetClz)); } diff --git a/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/discovery/ClassRegistry.java b/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/discovery/ClassRegistry.java index 68419e1b..d01f510e 100644 --- a/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/discovery/ClassRegistry.java +++ b/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/discovery/ClassRegistry.java @@ -31,7 +31,7 @@ import java.util.concurrent.ConcurrentHashMap; @NoArgsConstructor(access = AccessLevel.PRIVATE) public class ClassRegistry { - private static final Map> serverRegister = new ConcurrentHashMap<>(); + private static final Map> SERVER_REGISTER = new ConcurrentHashMap<>(); /** * get a Obj in Registry center
@@ -40,7 +40,7 @@ public class ClassRegistry { * @return t element */ public static Class get(String s) { - return serverRegister.get(s); + return SERVER_REGISTER.get(s); } /** @@ -53,7 +53,7 @@ public class ClassRegistry { * @return final mapped value */ public static Class set(String s, Class cls) { - return serverRegister.putIfAbsent(s, cls); + return SERVER_REGISTER.putIfAbsent(s, cls); } /** @@ -64,13 +64,13 @@ public class ClassRegistry { * @param cls element */ public static Class put(String s, Class cls) { - return serverRegister.put(s, cls); + return SERVER_REGISTER.put(s, cls); } /** * clear */ public static void clear() { - serverRegister.clear(); + SERVER_REGISTER.clear(); } } diff --git a/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/support/NettyClientSupport.java b/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/support/NettyClientSupport.java index 315aec4f..84797f44 100644 --- a/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/support/NettyClientSupport.java +++ b/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/support/NettyClientSupport.java @@ -60,7 +60,7 @@ public final class NettyClientSupport { /** * the cache for client */ - private static final Map clientMap = new ConcurrentHashMap<>(); + private static final Map CLIENT_MAP = new ConcurrentHashMap<>(); /** * Obtain the client connected to the server through the server address. If the client does not exist, create one @@ -70,7 +70,7 @@ public final class NettyClientSupport { * @return Client */ public static Client getClient(InetSocketAddress address, HandlerManager handlerManager) { - return clientMap.computeIfAbsent(address, a -> { + return CLIENT_MAP.computeIfAbsent(address, a -> { NettyClientPoolHandler handler = (handlerManager instanceof NettyClientPoolHandler) ? (NettyClientPoolHandler) handlerManager : new NettyClientPoolHandler(); @@ -98,7 +98,7 @@ public final class NettyClientSupport { * @param address the address */ public static void closeClient(InetSocketAddress address) { - Client client = clientMap.remove(address); + Client client = CLIENT_MAP.remove(address); Optional.ofNullable(client) .ifPresent(c -> { try { diff --git a/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/support/ResultHolder.java b/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/support/ResultHolder.java index 19ebc5db..fa57b9f1 100644 --- a/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/support/ResultHolder.java +++ b/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/support/ResultHolder.java @@ -38,8 +38,8 @@ import java.util.concurrent.locks.LockSupport; @NoArgsConstructor(access = AccessLevel.PRIVATE) public class ResultHolder { - private static final Map map = new ConcurrentHashMap<>(); - private static final Map threadMap = new HashMap<>(); + private static final Map MAP = new ConcurrentHashMap<>(); + private static final Map THREAD_MAP = new HashMap<>(); /** * Writes when the client receives a response @@ -51,7 +51,7 @@ public class ResultHolder { if (log.isDebugEnabled()) { log.debug("Write the result, wake up the thread"); } - map.put(key, o); + MAP.put(key, o); } /** @@ -64,7 +64,7 @@ public class ResultHolder { if (log.isDebugEnabled()) { log.debug("Write thread, waiting to wake up"); } - threadMap.put(key, t); + THREAD_MAP.put(key, t); } /** @@ -76,7 +76,7 @@ public class ResultHolder { if (log.isDebugEnabled()) { log.debug("The future has been fetched, wake up the thread"); } - Thread thread = threadMap.remove(key); + Thread thread = THREAD_MAP.remove(key); LockSupport.unpark(thread); } @@ -93,7 +93,7 @@ public class ResultHolder { if (log.isDebugEnabled()) { log.debug("Get the future"); } - return (T) map.remove(key); + return (T) MAP.remove(key); } }