diff --git a/src/main/java/top/csaf/ClassUtils.java b/src/main/java/top/csaf/ClassUtils.java index 1cb37b4757408849e46694f4a96c6435fc7d0c21..3787ff3208f2cf37ccf5fb98a71031d9000e5b39 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 564dd9e4c982b00e27d726d498d21a2ee94a87cb..cf545c7300bf7e5036e2adb96983c0e597260ff3 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 981ca3a633d411a889141246ffbbf86a807c4027..e95df84863c850d9d9be3b14771c04f530baace6 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 9db7b4ee4419f9176908bd515d823b4636768bdb..27832937736c79f97cbadfb5038bbb76fc6bca95 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 e2fb2e4aeb34b89883564c1db5f60003b1291873..e7dce554866089162292c7b7fd925b93574a28b4 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 71926371da64ef359e73fe90f7976f895c50b2ae..c2a4ea93447905198c51a37509f8459e3bbf3972 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 38c225cb36210f5cb07bfc86105571dcf9f42105..85745513c3a9f1b1a1a6d043e62eb8aa37e7bf2d 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 9faf8c9054c8913202d863a355fbfc98a9f847ad..0fad96ca9d8a673ef0ecd91f40f6aecf139dfd29 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 df862a9c781ca7ea4c1d102821104b6dd103422c..fa2b3617587775b504cdb45f9e7ed7b36567da4a 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 45d1bce33d06da6ccbcfcafa646af12359a8a2c3..11b9bd1748fecc3d81d7c049662aa37914e990af 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 902df2a1c6b4c3101e9d4f626e3d9e1e489ea6e3..68b78f6f5c24d0114bfef3fa2cc21e755b3a5c84 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 09a4164cdac3643fa643a93b946020b1602ef47d..cfa6268d376086c671e6bd4eb0ecdadcb1e4d696 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 194d119ff9912f2afbac272f281fbd4b63b7a4b1..b9f84add1e48c461579eb4852ef5222b5580a4c2 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 e7aaa2714829a33cd09cd4f18c841a8a86c00fde..9016182f6f76694a4e775cf84a471f81e25ceb33 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 86424e80bd01d34321456e518840afc32793b551..ea5559f19688c465ec2784b6db34bf96d6ca8ae3 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