From 5d79520c601d14f616505344c0bb60f8ff959185 Mon Sep 17 00:00:00 2001 From: yhc777 <71164753+yhc777@users.noreply.github.com> Date: Mon, 22 May 2023 22:45:50 +0800 Subject: [PATCH] check style (#1299) * style(hippo4j-threadpool-infra-common): checke style update * style(hippo4j-threadpool-infra-common): checke style update * style(hippo4j-threadpool-infra-common): check style log (info --> error) * style(hippo4j-threadpool-infra-common): @Slf4j * style(hippo4j-threadpool-infra-common): check style update --- checkstyle/hippo4j_checkstyle_suppression.xml | 8 ++++++- .../common/constant/HttpHeaderConstants.java | 24 +++++++++---------- .../common/constant/MagicNumberConstants.java | 9 +++++++ .../support/RejectedPolicyTypeEnum.java | 5 +++- .../extension/spi/ServiceLoaderRegistry.java | 2 +- .../cn/hippo4j/common/toolkit/BeanUtil.java | 2 +- .../common/toolkit/CollectionUtil.java | 4 +++- .../cn/hippo4j/common/toolkit/IoUtil.java | 4 +++- .../cn/hippo4j/common/toolkit/MapUtil.java | 6 +---- .../cn/hippo4j/common/toolkit/StringUtil.java | 6 +++-- .../hippo4j/common/toolkit/http/Header.java | 2 +- 11 files changed, 46 insertions(+), 26 deletions(-) diff --git a/checkstyle/hippo4j_checkstyle_suppression.xml b/checkstyle/hippo4j_checkstyle_suppression.xml index 1a328a45..59487b95 100644 --- a/checkstyle/hippo4j_checkstyle_suppression.xml +++ b/checkstyle/hippo4j_checkstyle_suppression.xml @@ -32,5 +32,11 @@ - + + + + + + + diff --git a/infra/common/src/main/java/cn/hippo4j/common/constant/HttpHeaderConstants.java b/infra/common/src/main/java/cn/hippo4j/common/constant/HttpHeaderConstants.java index 90ccfa52..a0e61a2c 100644 --- a/infra/common/src/main/java/cn/hippo4j/common/constant/HttpHeaderConstants.java +++ b/infra/common/src/main/java/cn/hippo4j/common/constant/HttpHeaderConstants.java @@ -20,27 +20,27 @@ package cn.hippo4j.common.constant; /** * Http header constants. */ -public interface HttpHeaderConstants { +public class HttpHeaderConstants { - String CLIENT_VERSION_HEADER = "Client-Version"; + public static final String CLIENT_VERSION_HEADER = "Client-Version"; - String USER_AGENT_HEADER = "User-Agent"; + public static final String USER_AGENT_HEADER = "User-Agent"; - String REQUEST_SOURCE_HEADER = "Request-Source"; + public static final String REQUEST_SOURCE_HEADER = "Request-Source"; - String CONTENT_TYPE = "Content-Type"; + public static final String CONTENT_TYPE = "Content-Type"; - String CONTENT_LENGTH = "Content-Length"; + public static final String CONTENT_LENGTH = "Content-Length"; - String ACCEPT_CHARSET = "Accept-Charset"; + public static final String ACCEPT_CHARSET = "Accept-Charset"; - String ACCEPT_ENCODING = "Accept-Encoding"; + public static final String ACCEPT_ENCODING = "Accept-Encoding"; - String CONTENT_ENCODING = "Content-Encoding"; + public static final String CONTENT_ENCODING = "Content-Encoding"; - String CONNECTION = "Requester"; + public static final String CONNECTION = "Requester"; - String REQUEST_ID = "RequestId"; + public static final String REQUEST_ID = "RequestId"; - String REQUEST_MODULE = "Request-Module"; + public static final String REQUEST_MODULE = "Request-Module"; } diff --git a/infra/common/src/main/java/cn/hippo4j/common/constant/MagicNumberConstants.java b/infra/common/src/main/java/cn/hippo4j/common/constant/MagicNumberConstants.java index fd0b5d18..1893f172 100644 --- a/infra/common/src/main/java/cn/hippo4j/common/constant/MagicNumberConstants.java +++ b/infra/common/src/main/java/cn/hippo4j/common/constant/MagicNumberConstants.java @@ -17,8 +17,13 @@ package cn.hippo4j.common.constant; +/** + * Magic Number Constants + */ public class MagicNumberConstants { + public static final int INDEX_NEGATIVE_1 = -1; + public static final int INDEX_0 = 0; public static final int INDEX_1 = 1; @@ -27,6 +32,10 @@ public class MagicNumberConstants { public static final int INDEX_3 = 3; + public static final int INDEX_10 = 10; + public static final int SIZE_4 = 4; + public static final long LONG_5 = 5L; + } diff --git a/infra/common/src/main/java/cn/hippo4j/common/executor/support/RejectedPolicyTypeEnum.java b/infra/common/src/main/java/cn/hippo4j/common/executor/support/RejectedPolicyTypeEnum.java index 651530d0..c9d9b8fd 100644 --- a/infra/common/src/main/java/cn/hippo4j/common/executor/support/RejectedPolicyTypeEnum.java +++ b/infra/common/src/main/java/cn/hippo4j/common/executor/support/RejectedPolicyTypeEnum.java @@ -20,7 +20,10 @@ package cn.hippo4j.common.executor.support; import cn.hippo4j.common.extension.spi.ServiceLoaderRegistry; import lombok.Getter; -import java.util.*; + +import java.util.Collection; +import java.util.Objects; +import java.util.Optional; import java.util.concurrent.RejectedExecutionHandler; import java.util.concurrent.ThreadPoolExecutor; import java.util.stream.Stream; diff --git a/infra/common/src/main/java/cn/hippo4j/common/extension/spi/ServiceLoaderRegistry.java b/infra/common/src/main/java/cn/hippo4j/common/extension/spi/ServiceLoaderRegistry.java index 5d6e7434..5a698ce6 100644 --- a/infra/common/src/main/java/cn/hippo4j/common/extension/spi/ServiceLoaderRegistry.java +++ b/infra/common/src/main/java/cn/hippo4j/common/extension/spi/ServiceLoaderRegistry.java @@ -29,7 +29,7 @@ import java.util.stream.Collectors; /** * Dynamic thread-pool SPI service loader. */ -public class ServiceLoaderRegistry { +public final class ServiceLoaderRegistry { /** * safe container。 diff --git a/infra/common/src/main/java/cn/hippo4j/common/toolkit/BeanUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/BeanUtil.java index 4b971a6a..5fed71f2 100644 --- a/infra/common/src/main/java/cn/hippo4j/common/toolkit/BeanUtil.java +++ b/infra/common/src/main/java/cn/hippo4j/common/toolkit/BeanUtil.java @@ -39,7 +39,7 @@ import java.util.Set; @NoArgsConstructor(access = AccessLevel.PRIVATE) public class BeanUtil { - protected static Mapper BEAN_MAPPER_BUILDER; + protected static final Mapper BEAN_MAPPER_BUILDER; static { BEAN_MAPPER_BUILDER = DozerBeanMapperBuilder.buildDefault(); diff --git a/infra/common/src/main/java/cn/hippo4j/common/toolkit/CollectionUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/CollectionUtil.java index 5a1fbbca..9e3c1792 100644 --- a/infra/common/src/main/java/cn/hippo4j/common/toolkit/CollectionUtil.java +++ b/infra/common/src/main/java/cn/hippo4j/common/toolkit/CollectionUtil.java @@ -17,6 +17,8 @@ package cn.hippo4j.common.toolkit; +import cn.hippo4j.common.constant.MagicNumberConstants; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -164,7 +166,7 @@ public class CollectionUtil { private static int computeArrayListCapacity(int arraySize) { checkNonnegative(arraySize); // TODO(kevinb): Figure out the right behavior, and document it - return saturatedCast(5L + arraySize + (arraySize / 10)); + return saturatedCast(MagicNumberConstants.LONG_5 + arraySize + (arraySize / MagicNumberConstants.INDEX_10)); } private static void checkNonnegative(int value) { diff --git a/infra/common/src/main/java/cn/hippo4j/common/toolkit/IoUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/IoUtil.java index 5c6b00fb..6f45c9a3 100644 --- a/infra/common/src/main/java/cn/hippo4j/common/toolkit/IoUtil.java +++ b/infra/common/src/main/java/cn/hippo4j/common/toolkit/IoUtil.java @@ -19,6 +19,7 @@ package cn.hippo4j.common.toolkit; import cn.hippo4j.common.constant.Constants; import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; import java.io.BufferedReader; import java.io.ByteArrayInputStream; @@ -47,6 +48,7 @@ import java.util.zip.GZIPOutputStream; * * @author nacos */ +@Slf4j public class IoUtil { /** @@ -98,7 +100,7 @@ public class IoUtil { try (GZIPOutputStream gzip = new GZIPOutputStream(out)) { gzip.write(str.getBytes(encoding)); } catch (Exception e) { - e.printStackTrace(); + log.error("gzip write is fail: {}", e.getMessage()); } return out.toByteArray(); } diff --git a/infra/common/src/main/java/cn/hippo4j/common/toolkit/MapUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/MapUtil.java index 6a15ca92..3d2c3fef 100644 --- a/infra/common/src/main/java/cn/hippo4j/common/toolkit/MapUtil.java +++ b/infra/common/src/main/java/cn/hippo4j/common/toolkit/MapUtil.java @@ -181,11 +181,7 @@ public class MapUtil { * @return */ private static boolean checkKey(String key, String filters) { - if (key.contains(filters)) { - return true; - } else { - return false; - } + return key.contains(filters); } /** diff --git a/infra/common/src/main/java/cn/hippo4j/common/toolkit/StringUtil.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/StringUtil.java index d7f105a4..7c74e2cc 100644 --- a/infra/common/src/main/java/cn/hippo4j/common/toolkit/StringUtil.java +++ b/infra/common/src/main/java/cn/hippo4j/common/toolkit/StringUtil.java @@ -17,6 +17,8 @@ package cn.hippo4j.common.toolkit; +import cn.hippo4j.common.constant.MagicNumberConstants; + import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -354,10 +356,10 @@ public class StringUtil { return EMPTY; } int pos = str.indexOf(symbol); - if (-1 == pos) { + if (MagicNumberConstants.INDEX_NEGATIVE_1 == pos) { return str; } - if (0 == pos) { + if (MagicNumberConstants.INDEX_0 == pos) { return EMPTY; } return str.substring(0, pos); diff --git a/infra/common/src/main/java/cn/hippo4j/common/toolkit/http/Header.java b/infra/common/src/main/java/cn/hippo4j/common/toolkit/http/Header.java index b59c509d..79d315d5 100644 --- a/infra/common/src/main/java/cn/hippo4j/common/toolkit/http/Header.java +++ b/infra/common/src/main/java/cn/hippo4j/common/toolkit/http/Header.java @@ -34,7 +34,7 @@ import java.util.TreeMap; * * @author liaochuntao */ -public class Header { +public final class Header { public static final Header EMPTY = Header.newInstance();