From 91ef767fe4afba2e04b2922e4e48642bb6cdd405 Mon Sep 17 00:00:00 2001 From: duanluan Date: Thu, 4 May 2023 04:28:34 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/top/csaf/ClassUtils.java | 4 ++-- src/test/java/top/csaf/junit/ArrayUtilsTest.java | 2 +- src/test/java/top/csaf/junit/BeanUtilsTest.java | 4 +++- src/test/java/top/csaf/junit/ClassUtilsTest.java | 2 +- src/test/java/top/csaf/junit/CollectionUtilsTest.java | 2 +- src/test/java/top/csaf/junit/DateUtilsTest.java | 2 +- src/test/java/top/csaf/junit/FileUtilsTest.java | 2 +- src/test/java/top/csaf/junit/HttpUtilsTest.java | 2 +- src/test/java/top/csaf/junit/PinyinUtilsTest.java | 2 +- src/test/java/top/csaf/junit/RegExUtilsTest.java | 2 +- src/test/java/top/csaf/junit/SecurityUtilsTest.java | 2 +- src/test/java/top/csaf/junit/StringUtilsTest.java | 2 +- src/test/java/top/csaf/junit/XmlUtilsTest.java | 2 +- src/test/java/top/csaf/junit/YamlUtilsTest.java | 2 +- src/test/java/top/csaf/junit/id/SnowFlakeTest.java | 2 +- 15 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/main/java/top/csaf/ClassUtils.java b/src/main/java/top/csaf/ClassUtils.java index 1cb37b4..3787ff3 100644 --- a/src/main/java/top/csaf/ClassUtils.java +++ b/src/main/java/top/csaf/ClassUtils.java @@ -19,7 +19,7 @@ public class ClassUtils extends org.apache.commons.lang3.ClassUtils { throw new IllegalArgumentException("Classes: length should be greater than 0"); } for (Class clazz : classes) { - if (!((Integer.class.equals(clazz)) || + if (!(Integer.class.equals(clazz) || Long.class.equals(clazz) || Double.class.equals(clazz) || Float.class.equals(clazz) || @@ -48,7 +48,7 @@ public class ClassUtils extends org.apache.commons.lang3.ClassUtils { throw new IllegalArgumentException("Objects: length should be greater than 0"); } for (Object object : objects) { - if (!((object instanceof Integer) || + if (!(object instanceof Integer || object instanceof Long || object instanceof Double || object instanceof Float || diff --git a/src/test/java/top/csaf/junit/ArrayUtilsTest.java b/src/test/java/top/csaf/junit/ArrayUtilsTest.java index 564dd9e..cf545c7 100644 --- a/src/test/java/top/csaf/junit/ArrayUtilsTest.java +++ b/src/test/java/top/csaf/junit/ArrayUtilsTest.java @@ -12,7 +12,7 @@ import java.nio.charset.Charset; import static org.junit.jupiter.api.Assertions.*; @DisplayName("数组工具类测试") -public class ArrayUtilsTest { +class ArrayUtilsTest { @DisplayName("toBytesAndToString：转字节数组和转字符串") @Test diff --git a/src/test/java/top/csaf/junit/BeanUtilsTest.java b/src/test/java/top/csaf/junit/BeanUtilsTest.java index 981ca3a..e95df84 100644 --- a/src/test/java/top/csaf/junit/BeanUtilsTest.java +++ b/src/test/java/top/csaf/junit/BeanUtilsTest.java @@ -1,6 +1,7 @@ package top.csaf.junit; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -13,7 +14,7 @@ import java.util.*; import static org.junit.jupiter.api.Assertions.*; @DisplayName("Bean 工具类测试") -public class BeanUtilsTest { +class BeanUtilsTest { @NoArgsConstructor @Data @@ -21,6 +22,7 @@ public class BeanUtilsTest { private String superName; } + @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @Data public static class TestBean extends TestSuperBean implements Serializable { diff --git a/src/test/java/top/csaf/junit/ClassUtilsTest.java b/src/test/java/top/csaf/junit/ClassUtilsTest.java index 9db7b4e..2783293 100644 --- a/src/test/java/top/csaf/junit/ClassUtilsTest.java +++ b/src/test/java/top/csaf/junit/ClassUtilsTest.java @@ -7,7 +7,7 @@ import top.csaf.ClassUtils; @Slf4j @DisplayName("Class 工具类测试") -public class ClassUtilsTest { +class ClassUtilsTest { private void println(Object source) { System.out.println(source); diff --git a/src/test/java/top/csaf/junit/CollectionUtilsTest.java b/src/test/java/top/csaf/junit/CollectionUtilsTest.java index e2fb2e4..e7dce55 100644 --- a/src/test/java/top/csaf/junit/CollectionUtilsTest.java +++ b/src/test/java/top/csaf/junit/CollectionUtilsTest.java @@ -19,7 +19,7 @@ import static org.junit.jupiter.api.Assertions.*; @Slf4j @DisplayName("集合工具类测试") -public class CollectionUtilsTest { +class CollectionUtilsTest { public static void main(String[] args) { genCollections4Fn(); diff --git a/src/test/java/top/csaf/junit/DateUtilsTest.java b/src/test/java/top/csaf/junit/DateUtilsTest.java index 7192637..c2a4ea9 100644 --- a/src/test/java/top/csaf/junit/DateUtilsTest.java +++ b/src/test/java/top/csaf/junit/DateUtilsTest.java @@ -17,7 +17,7 @@ import java.util.Locale; @Slf4j @DisplayName("时间工具类测试") -public class DateUtilsTest { +class DateUtilsTest { private final ZonedDateTime nowZonedDateTime = ZonedDateTime.now(); private final LocalDateTime nowLocalDateTime = LocalDateTime.now(); diff --git a/src/test/java/top/csaf/junit/FileUtilsTest.java b/src/test/java/top/csaf/junit/FileUtilsTest.java index 38c225c..8574551 100644 --- a/src/test/java/top/csaf/junit/FileUtilsTest.java +++ b/src/test/java/top/csaf/junit/FileUtilsTest.java @@ -10,7 +10,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; @Slf4j @DisplayName("文件工具类测试") -public class FileUtilsTest { +class FileUtilsTest { private static final String PROJECT_PATH = FileUtils.getUserDir(); private static final String PROJECT_PATH_SLASH = FileUtils.getUserDir().replace("\\", "/"); diff --git a/src/test/java/top/csaf/junit/HttpUtilsTest.java b/src/test/java/top/csaf/junit/HttpUtilsTest.java index 9faf8c9..0fad96c 100644 --- a/src/test/java/top/csaf/junit/HttpUtilsTest.java +++ b/src/test/java/top/csaf/junit/HttpUtilsTest.java @@ -21,7 +21,7 @@ import java.util.Map; @Slf4j @DisplayName("HTTP 工具类测试") -public class HttpUtilsTest { +class HttpUtilsTest { @DisplayName("获取 Media Types") @Test diff --git a/src/test/java/top/csaf/junit/PinyinUtilsTest.java b/src/test/java/top/csaf/junit/PinyinUtilsTest.java index df862a9..fa2b361 100644 --- a/src/test/java/top/csaf/junit/PinyinUtilsTest.java +++ b/src/test/java/top/csaf/junit/PinyinUtilsTest.java @@ -24,7 +24,7 @@ import java.util.regex.Pattern; @Slf4j @DisplayName("拼音工具类测试") -public class PinyinUtilsTest { +class PinyinUtilsTest { private static final Pattern PINYIN_PATTERN_A = Pattern.compile("[āáǎà]"); private static final Pattern PINYIN_PATTERN_O = Pattern.compile("[ōóǒò]"); diff --git a/src/test/java/top/csaf/junit/RegExUtilsTest.java b/src/test/java/top/csaf/junit/RegExUtilsTest.java index 45d1bce..11b9bd1 100644 --- a/src/test/java/top/csaf/junit/RegExUtilsTest.java +++ b/src/test/java/top/csaf/junit/RegExUtilsTest.java @@ -13,7 +13,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; @Slf4j @DisplayName("正则工具类测试") -public class RegExUtilsTest { +class RegExUtilsTest { @Test void testCodeCoverage() { diff --git a/src/test/java/top/csaf/junit/SecurityUtilsTest.java b/src/test/java/top/csaf/junit/SecurityUtilsTest.java index 902df2a..68b78f6 100644 --- a/src/test/java/top/csaf/junit/SecurityUtilsTest.java +++ b/src/test/java/top/csaf/junit/SecurityUtilsTest.java @@ -13,7 +13,7 @@ import java.security.spec.InvalidKeySpecException; @Slf4j @DisplayName("加密解密工具类测试") -public class SecurityUtilsTest { +class SecurityUtilsTest { private void println(Object source) { System.out.println(source); diff --git a/src/test/java/top/csaf/junit/StringUtilsTest.java b/src/test/java/top/csaf/junit/StringUtilsTest.java index 09a4164..cfa6268 100644 --- a/src/test/java/top/csaf/junit/StringUtilsTest.java +++ b/src/test/java/top/csaf/junit/StringUtilsTest.java @@ -9,7 +9,7 @@ import java.util.Collections; @Slf4j @DisplayName("字符串工具类测试") -public class StringUtilsTest { +class StringUtilsTest { private void println(Object source) { System.out.println(source); diff --git a/src/test/java/top/csaf/junit/XmlUtilsTest.java b/src/test/java/top/csaf/junit/XmlUtilsTest.java index 194d119..b9f84ad 100644 --- a/src/test/java/top/csaf/junit/XmlUtilsTest.java +++ b/src/test/java/top/csaf/junit/XmlUtilsTest.java @@ -13,7 +13,7 @@ import top.csaf.io.FileUtils; @Slf4j @DisplayName("XML 工具类测试") -public class XmlUtilsTest { +class XmlUtilsTest { private void println(Object source) { System.out.println(source); diff --git a/src/test/java/top/csaf/junit/YamlUtilsTest.java b/src/test/java/top/csaf/junit/YamlUtilsTest.java index e7aaa27..9016182 100644 --- a/src/test/java/top/csaf/junit/YamlUtilsTest.java +++ b/src/test/java/top/csaf/junit/YamlUtilsTest.java @@ -10,7 +10,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; @Slf4j @DisplayName("YAML 工具类测试") -public class YamlUtilsTest { +class YamlUtilsTest { private static final String YML_FILE_PATH = FileUtils.getProjectPath() + "/src/test/java/top/csaf/assets/yaml/test.yml"; diff --git a/src/test/java/top/csaf/junit/id/SnowFlakeTest.java b/src/test/java/top/csaf/junit/id/SnowFlakeTest.java index 86424e8..ea5559f 100644 --- a/src/test/java/top/csaf/junit/id/SnowFlakeTest.java +++ b/src/test/java/top/csaf/junit/id/SnowFlakeTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; import top.csaf.id.SnowFlake; @DisplayName("雪花算法测试") -public class SnowFlakeTest { +class SnowFlakeTest { @DisplayName("简单实现") @Test -- GitLab