> primitiveTypes = new ArrayList<>(32);
@@ -179,7 +180,7 @@ public class ClassLoaderUtil {
*
*
* @param name 类名
- * @param classLoader {@link ClassLoader}，{@code null} 则使用系统默认ClassLoader
+ * @param classLoader {@link ClassLoader}，{@code null} 则使用{@link #getClassLoader()}获取
* @param isInitialized 是否初始化类（调用static模块内容和初始化static属性）
* @return 类名对应的类
* @throws UtilException 包装{@link ClassNotFoundException}，没有类名对应的类时抛出此异常
@@ -189,49 +190,18 @@ public class ClassLoaderUtil {
// 自动将包名中的"/"替换为"."
name = name.replace(CharPool.SLASH, CharPool.DOT);
+ if(null == classLoader){
+ classLoader = getClassLoader();
+ }
// 加载原始类型和缓存中的类
Class clazz = loadPrimitiveClass(name);
if (clazz == null) {
- clazz = CLASS_CACHE.get(name);
+ final String finalName = name;
+ final ClassLoader finalClassLoader = classLoader;
+ clazz = CLASS_CACHE.computeIfAbsent(Pair.of(name, classLoader), (key)-> doLoadClass(finalName, finalClassLoader, isInitialized));
}
- if (clazz != null) {
- return clazz;
- }
-
- if (name.endsWith(ARRAY_SUFFIX)) {
- // 对象数组"java.lang.String[]"风格
- final String elementClassName = name.substring(0, name.length() - ARRAY_SUFFIX.length());
- final Class elementClass = loadClass(elementClassName, classLoader, isInitialized);
- clazz = Array.newInstance(elementClass, 0).getClass();
- } else if (name.startsWith(NON_PRIMITIVE_ARRAY_PREFIX) && name.endsWith(";")) {
- // "[Ljava.lang.String;" 风格
- final String elementName = name.substring(NON_PRIMITIVE_ARRAY_PREFIX.length(), name.length() - 1);
- final Class elementClass = loadClass(elementName, classLoader, isInitialized);
- clazz = Array.newInstance(elementClass, 0).getClass();
- } else if (name.startsWith(INTERNAL_ARRAY_PREFIX)) {
- // "[[I" 或 "[[Ljava.lang.String;" 风格
- final String elementName = name.substring(INTERNAL_ARRAY_PREFIX.length());
- final Class elementClass = loadClass(elementName, classLoader, isInitialized);
- clazz = Array.newInstance(elementClass, 0).getClass();
- } else {
- // 加载普通类
- if (null == classLoader) {
- classLoader = getClassLoader();
- }
- try {
- clazz = Class.forName(name, isInitialized, classLoader);
- } catch (ClassNotFoundException ex) {
- // 尝试获取内部类，例如java.lang.Thread.State =》java.lang.Thread$State
- clazz = tryLoadInnerClass(name, classLoader, isInitialized);
- if (null == clazz) {
- throw new UtilException(ex);
- }
- }
- }
-
- // 加入缓存并返回
- return CLASS_CACHE.put(name, clazz);
+ return clazz;
}
/**
@@ -311,6 +281,47 @@ public class ClassLoaderUtil {
}
// ----------------------------------------------------------------------------------- Private method start
+ /**
+ * 加载非原始类类，无缓存
+ * @param name 类名
+ * @param classLoader {@link ClassLoader}
+ * @param isInitialized 是否初始化
+ * @return 类
+ */
+ private static Class doLoadClass(String name, ClassLoader classLoader, boolean isInitialized){
+ Class clazz;
+ if (name.endsWith(ARRAY_SUFFIX)) {
+ // 对象数组"java.lang.String[]"风格
+ final String elementClassName = name.substring(0, name.length() - ARRAY_SUFFIX.length());
+ final Class elementClass = loadClass(elementClassName, classLoader, isInitialized);
+ clazz = Array.newInstance(elementClass, 0).getClass();
+ } else if (name.startsWith(NON_PRIMITIVE_ARRAY_PREFIX) && name.endsWith(";")) {
+ // "[Ljava.lang.String;" 风格
+ final String elementName = name.substring(NON_PRIMITIVE_ARRAY_PREFIX.length(), name.length() - 1);
+ final Class elementClass = loadClass(elementName, classLoader, isInitialized);
+ clazz = Array.newInstance(elementClass, 0).getClass();
+ } else if (name.startsWith(INTERNAL_ARRAY_PREFIX)) {
+ // "[[I" 或 "[[Ljava.lang.String;" 风格
+ final String elementName = name.substring(INTERNAL_ARRAY_PREFIX.length());
+ final Class elementClass = loadClass(elementName, classLoader, isInitialized);
+ clazz = Array.newInstance(elementClass, 0).getClass();
+ } else {
+ // 加载普通类
+ if (null == classLoader) {
+ classLoader = getClassLoader();
+ }
+ try {
+ clazz = Class.forName(name, isInitialized, classLoader);
+ } catch (ClassNotFoundException ex) {
+ // 尝试获取内部类，例如java.lang.Thread.State =》java.lang.Thread$State
+ clazz = tryLoadInnerClass(name, classLoader, isInitialized);
+ if (null == clazz) {
+ throw new UtilException(ex);
+ }
+ }
+ }
+ return clazz;
+ }
/**
* 尝试转换并加载内部类，例如java.lang.Thread.State =》java.lang.Thread$State
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ClassUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/ClassUtil.java
index a25d41504..e697fed49 100755
--- a/hutool-core/src/main/java/cn/hutool/core/util/ClassUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/ClassUtil.java
@@ -999,26 +999,44 @@ public class ClassUtil {
* @since 3.0.8
*/
public static Object getDefaultValue(Class clazz) {
+ // 原始类型
if (clazz.isPrimitive()) {
- if (long.class == clazz) {
- return 0L;
- } else if (int.class == clazz) {
- return 0;
- } else if (short.class == clazz) {
- return (short) 0;
- } else if (char.class == clazz) {
- return (char) 0;
- } else if (byte.class == clazz) {
- return (byte) 0;
- } else if (double.class == clazz) {
- return 0D;
- } else if (float.class == clazz) {
- return 0f;
- } else if (boolean.class == clazz) {
- return false;
- }
+ return getPrimitiveDefaultValue(clazz);
}
+ return null;
+ }
+ /**
+ * 获取指定原始类型分的默认值
+ * 默认值规则为：
+ *
+ *
+ * 1、如果为原始类型，返回0
+ * 2、非原始类型返回{@code null}
+ *
+ *
+ * @param clazz 类
+ * @return 默认值
+ * @since 5.8.0
+ */
+ public static Object getPrimitiveDefaultValue(Class clazz) {
+ if (long.class == clazz) {
+ return 0L;
+ } else if (int.class == clazz) {
+ return 0;
+ } else if (short.class == clazz) {
+ return (short) 0;
+ } else if (char.class == clazz) {
+ return (char) 0;
+ } else if (byte.class == clazz) {
+ return (byte) 0;
+ } else if (double.class == clazz) {
+ return 0D;
+ } else if (float.class == clazz) {
+ return 0f;
+ } else if (boolean.class == clazz) {
+ return false;
+ }
return null;
}
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java
index 7c760583f..9e1278ebc 100755
--- a/hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java
@@ -15,11 +15,11 @@ import java.util.Objects;
/**
* 身份证相关工具类
- * see https://www.oschina.net/code/snippet_1611_2881
+ * see https://www.oschina.net/code/snippet_1611_2881
*
*
* 本工具并没有对行政区划代码做校验，如有需求，请参阅（2018年10月）：
- * http://www.mca.gov.cn/article/sj/xzqh/2018/201804-12/20181011221630.html
+ * http://www.mca.gov.cn/article/sj/xzqh/2018/201804-12/20181011221630.html
*
*
* @author Looly
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/NumberUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/NumberUtil.java
index 48e179d2a..3deccb27a 100755
--- a/hutool-core/src/main/java/cn/hutool/core/util/NumberUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/NumberUtil.java
@@ -2541,7 +2541,7 @@ public class NumberUtil {
/**
* int值转byte数组，使用大端字节序（高位字节在前，低位字节在后）
- * 见：http://www.ruanyifeng.com/blog/2016/11/byte-order.html
+ * 见：http://www.ruanyifeng.com/blog/2016/11/byte-order.html
*
* @param value 值
* @return byte数组
@@ -2560,7 +2560,7 @@ public class NumberUtil {
/**
* byte数组转int，使用大端字节序（高位字节在前，低位字节在后）
- * 见：http://www.ruanyifeng.com/blog/2016/11/byte-order.html
+ * 见：http://www.ruanyifeng.com/blog/2016/11/byte-order.html
*
* @param bytes byte数组
* @return int
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ReflectUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/ReflectUtil.java
index 7b746bc6e..39d94196e 100755
--- a/hutool-core/src/main/java/cn/hutool/core/util/ReflectUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/ReflectUtil.java
@@ -8,11 +8,12 @@ import cn.hutool.core.convert.Convert;
import cn.hutool.core.exceptions.UtilException;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.lang.Filter;
-import cn.hutool.core.lang.SimpleCache;
import cn.hutool.core.lang.reflect.MethodHandleUtil;
import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.map.WeakConcurrentMap;
import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Array;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
@@ -36,15 +37,15 @@ public class ReflectUtil {
/**
* 构造对象缓存
*/
- private static final SimpleCache, Constructor[]> CONSTRUCTORS_CACHE = new SimpleCache<>();
+ private static final WeakConcurrentMap, Constructor[]> CONSTRUCTORS_CACHE = new WeakConcurrentMap<>();
/**
* 字段缓存
*/
- private static final SimpleCache, Field[]> FIELDS_CACHE = new SimpleCache<>();
+ private static final WeakConcurrentMap, Field[]> FIELDS_CACHE = new WeakConcurrentMap<>();
/**
* 方法缓存
*/
- private static final SimpleCache, Method[]> METHODS_CACHE = new SimpleCache<>();
+ private static final WeakConcurrentMap, Method[]> METHODS_CACHE = new WeakConcurrentMap<>();
// --------------------------------------------------------------------------------------------------------- Constructor
@@ -86,7 +87,7 @@ public class ReflectUtil {
@SuppressWarnings("unchecked")
public static Constructor[] getConstructors(Class beanClass) throws SecurityException {
Assert.notNull(beanClass);
- return (Constructor[]) CONSTRUCTORS_CACHE.get(beanClass, () -> getConstructorsDirectly(beanClass));
+ return (Constructor[]) CONSTRUCTORS_CACHE.computeIfAbsent(beanClass, () -> getConstructorsDirectly(beanClass));
}
/**
@@ -175,7 +176,7 @@ public class ReflectUtil {
*/
public static Field[] getFields(Class beanClass) throws SecurityException {
Assert.notNull(beanClass);
- return FIELDS_CACHE.get(beanClass, () -> getFieldsDirectly(beanClass, true));
+ return FIELDS_CACHE.computeIfAbsent(beanClass, () -> getFieldsDirectly(beanClass, true));
}
@@ -651,7 +652,7 @@ public class ReflectUtil {
*/
public static Method[] getMethods(Class beanClass) throws SecurityException {
Assert.notNull(beanClass);
- return METHODS_CACHE.get(beanClass,
+ return METHODS_CACHE.computeIfAbsent(beanClass,
() -> getMethodsDirectly(beanClass, true, true));
}
@@ -864,30 +865,45 @@ public class ReflectUtil {
*
*
* @param 对象类型
- * @param beanClass 被构造的类
+ * @param type 被构造的类
* @return 构造后的对象，构造失败返回{@code null}
*/
@SuppressWarnings("unchecked")
- public static T newInstanceIfPossible(Class beanClass) {
- Assert.notNull(beanClass);
+ public static T newInstanceIfPossible(Class type) {
+ Assert.notNull(type);
+
+ // 原始类型
+ if(type.isPrimitive()){
+ return (T) ClassUtil.getPrimitiveDefaultValue(type);
+ }
// 某些特殊接口的实例化按照默认实现进行
- if (beanClass.isAssignableFrom(AbstractMap.class)) {
- beanClass = (Class) HashMap.class;
- } else if (beanClass.isAssignableFrom(List.class)) {
- beanClass = (Class) ArrayList.class;
- } else if (beanClass.isAssignableFrom(Set.class)) {
- beanClass = (Class) HashSet.class;
+ if (type.isAssignableFrom(AbstractMap.class)) {
+ type = (Class) HashMap.class;
+ } else if (type.isAssignableFrom(List.class)) {
+ type = (Class) ArrayList.class;
+ } else if (type.isAssignableFrom(Set.class)) {
+ type = (Class) HashSet.class;
}
try {
- return newInstance(beanClass);
+ return newInstance(type);
} catch (Exception e) {
// ignore
// 默认构造不存在的情况下查找其它构造
}
- final Constructor[] constructors = getConstructors(beanClass);
+ // 枚举
+ if (type.isEnum()) {
+ return type.getEnumConstants()[0];
+ }
+
+ // 数组
+ if (type.isArray()) {
+ return (T) Array.newInstance(type.getComponentType(), 0);
+ }
+
+ final Constructor[] constructors = getConstructors(type);
Class[] parameterTypes;
for (Constructor constructor : constructors) {
parameterTypes = constructor.getParameterTypes();
diff --git a/hutool-core/src/test/java/cn/hutool/core/annotation/AnnotationForTest.java b/hutool-core/src/test/java/cn/hutool/core/annotation/AnnotationForTest.java
index 83210ae90..f109e836d 100755
--- a/hutool-core/src/test/java/cn/hutool/core/annotation/AnnotationForTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/annotation/AnnotationForTest.java
@@ -7,7 +7,7 @@ import java.lang.annotation.Target;
/**
* 用于单元测试的注解类
- * 注解类相关说明见：https://www.cnblogs.com/xdp-gacl/p/3622275.html
+ * 注解类相关说明见：https://www.cnblogs.com/xdp-gacl/p/3622275.html
*
* @author looly
*/
diff --git a/hutool-core/src/test/java/cn/hutool/core/annotation/AnnotationUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/annotation/AnnotationUtilTest.java
index 3340dcf37..167b62d2c 100755
--- a/hutool-core/src/test/java/cn/hutool/core/annotation/AnnotationUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/annotation/AnnotationUtilTest.java
@@ -3,8 +3,25 @@ package cn.hutool.core.annotation;
import org.junit.Assert;
import org.junit.Test;
+import java.lang.annotation.Annotation;
+
public class AnnotationUtilTest {
+ @Test
+ public void getCombinationAnnotationsTest(){
+ Annotation[] annotations = AnnotationUtil.getAnnotations(ClassWithAnnotation.class, true);
+ Assert.assertNotNull(annotations);
+ Assert.assertEquals(3, annotations.length);
+ }
+
+ @Test
+ public void getCombinationAnnotationsWithClassTest(){
+ AnnotationForTest[] annotations = AnnotationUtil.getCombinationAnnotations(ClassWithAnnotation.class, AnnotationForTest.class);
+ Assert.assertNotNull(annotations);
+ Assert.assertEquals(2, annotations.length);
+ Assert.assertEquals("测试", annotations[0].value());
+ }
+
@Test
public void getAnnotationValueTest() {
Object value = AnnotationUtil.getAnnotationValue(ClassWithAnnotation.class, AnnotationForTest.class);
@@ -23,6 +40,7 @@ public class AnnotationUtilTest {
}
@AnnotationForTest("测试")
+ @RepeatAnnotationForTest
static class ClassWithAnnotation{
public void test(){
diff --git a/hutool-core/src/test/java/cn/hutool/core/annotation/RepeatAnnotationForTest.java b/hutool-core/src/test/java/cn/hutool/core/annotation/RepeatAnnotationForTest.java
new file mode 100755
index 000000000..cc71c68da
--- /dev/null
+++ b/hutool-core/src/test/java/cn/hutool/core/annotation/RepeatAnnotationForTest.java
@@ -0,0 +1,16 @@
+package cn.hutool.core.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author hongda.li 2022-04-26 17:09
+ */
+@AnnotationForTest("repeat-annotation")
+@Retention(RetentionPolicy.RUNTIME)
+// Target注解决定MyAnnotation注解可以加在哪些成分上，如加在类身上，或者属性身上，或者方法身上等成分
+@Target({ ElementType.METHOD, ElementType.TYPE })
+public @interface RepeatAnnotationForTest {
+}
diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/BeanUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/bean/BeanUtilTest.java
index 6e9a687b7..89de82f85 100755
--- a/hutool-core/src/test/java/cn/hutool/core/bean/BeanUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/bean/BeanUtilTest.java
@@ -777,4 +777,20 @@ public class BeanUtilTest {
public static class Test2 {
private List strList;
}
+
+ @Test
+ public void issuesI53O9JTest(){
+ Map map = new HashMap<>();
+ map.put("statusIdUpdateTime", "");
+
+ WkCrmCustomer customer = new WkCrmCustomer();
+ BeanUtil.copyProperties(map, customer);
+
+ Assert.assertNull(customer.getStatusIdUpdateTime());
+ }
+
+ @Data
+ public static class WkCrmCustomer{
+ private LocalDateTime statusIdUpdateTime;
+ }
}
diff --git a/hutool-core/src/test/java/cn/hutool/core/codec/HashidsTest.java b/hutool-core/src/test/java/cn/hutool/core/codec/HashidsTest.java
new file mode 100755
index 000000000..458cde5b1
--- /dev/null
+++ b/hutool-core/src/test/java/cn/hutool/core/codec/HashidsTest.java
@@ -0,0 +1,20 @@
+package cn.hutool.core.codec;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class HashidsTest {
+ @Test
+ public void hexEncodeDecode() {
+ final Hashids hashids = Hashids.create("my awesome salt".toCharArray());
+ final String encoded1 = hashids.encodeFromHex("507f1f77bcf86cd799439011");
+ final String encoded2 = hashids.encodeFromHex("0x507f1f77bcf86cd799439011");
+ final String encoded3 = hashids.encodeFromHex("0X507f1f77bcf86cd799439011");
+
+ Assert.assertEquals("R2qnd2vkOJTXm7XV7yq4", encoded1);
+ Assert.assertEquals(encoded1, encoded2);
+ Assert.assertEquals(encoded1, encoded3);
+ final String decoded = hashids.decodeToHex(encoded1);
+ Assert.assertEquals("507f1f77bcf86cd799439011", decoded);
+ }
+}
diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java
index ad0582e18..512b13e2d 100755
--- a/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java
@@ -878,6 +878,36 @@ public class CollUtilTest {
Assert.assertEquals(people.get(1).getGender(), "小孩");
}
+ @Test
+ public void distinctTest(){
+ final ArrayList distinct = CollUtil.distinct(ListUtil.of(5, 3, 10, 9, 0, 5, 10, 9));
+ Assert.assertEquals(ListUtil.of(5, 3, 10, 9, 0), distinct);
+ }
+
+ @Test
+ public void distinctByFunctionTest(){
+ List people = Arrays.asList(
+ new Person("aa", 12, "man", 1),
+ new Person("bb", 13, "woman", 2),
+ new Person("cc", 14, "man", 3),
+ new Person("dd", 15, "woman", 4),
+ new Person("ee", 16, "woman", 5),
+ new Person("ff", 17, "man", 6)
+ );
+
+ // 覆盖模式下ff覆盖了aa，ee覆盖了bb
+ List distinct = CollUtil.distinct(people, Person::getGender, true);
+ Assert.assertEquals(2, distinct.size());
+ Assert.assertEquals("ff", distinct.get(0).getName());
+ Assert.assertEquals("ee", distinct.get(1).getName());
+
+ // 非覆盖模式下，保留了最早加入的aa和bb
+ distinct = CollUtil.distinct(people, Person::getGender, false);
+ Assert.assertEquals(2, distinct.size());
+ Assert.assertEquals("aa", distinct.get(0).getName());
+ Assert.assertEquals("bb", distinct.get(1).getName());
+ }
+
@Data
@AllArgsConstructor
static class Person {
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java
index b9de72b6f..7874b5cd9 100755
--- a/hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java
@@ -1029,6 +1029,7 @@ public class DateUtilTest {
}
@Test
+ @SuppressWarnings("ConstantConditions")
public void isOverlapTest() {
DateTime oneStartTime = DateUtil.parse("2022-01-01 10:10:10");
DateTime oneEndTime = DateUtil.parse("2022-01-01 11:10:10");
@@ -1055,6 +1056,16 @@ public class DateUtilTest {
Assert.assertFalse(DateUtil.isOverlap(realStartTime1,realEndTime1,startTime,endTime));
Assert.assertFalse(DateUtil.isOverlap(startTime,endTime,realStartTime1,realEndTime1));
+ }
+ @Test
+ public void isInTest(){
+ String sourceStr = "2022-04-19 00:00:00";
+ String startTimeStr = "2022-04-19 00:00:00";
+ String endTimeStr = "2022-04-19 23:59:59";
+ boolean between = DateUtil.isIn(DateUtil.parse(startTimeStr),
+ DateUtil.parse(endTimeStr),
+ DateUtil.parse(sourceStr));
+ Assert.assertTrue(between);
}
}
diff --git a/hutool-core/src/test/java/cn/hutool/core/io/FileTypeUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/io/FileTypeUtilTest.java
index b4c85a1aa..4ea9bddb6 100755
--- a/hutool-core/src/test/java/cn/hutool/core/io/FileTypeUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/io/FileTypeUtilTest.java
@@ -5,7 +5,9 @@ import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
+import java.io.BufferedInputStream;
import java.io.File;
+import java.io.IOException;
/**
* 文件类型判断单元测试
@@ -62,4 +64,15 @@ public class FileTypeUtilTest {
Assert.assertEquals("xlsx", type);
}
+ @Test
+ @Ignore
+ public void getTypeFromInputStream() throws IOException {
+ File file = FileUtil.file("d:/test/pic.jpg");
+ final BufferedInputStream inputStream = FileUtil.getInputStream(file);
+ inputStream.mark(0);
+ String type = FileTypeUtil.getType(inputStream);
+
+ inputStream.reset();
+ }
+
}
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/ConsoleTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/ConsoleTest.java
index ee667974b..01a92e70f 100755
--- a/hutool-core/src/test/java/cn/hutool/core/lang/ConsoleTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/ConsoleTest.java
@@ -75,4 +75,9 @@ public class ConsoleTest {
}
}
+ @Test
+ public void printColorTest(){
+ System.out.print("\33[30;1m A \u001b[31;2m B \u001b[32;1m C \u001b[33;1m D \u001b[0m");
+ }
+
}
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/SimpleCacheTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/SimpleCacheTest.java
index e32c78a90..8b15d28e6 100755
--- a/hutool-core/src/test/java/cn/hutool/core/lang/SimpleCacheTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/SimpleCacheTest.java
@@ -50,7 +50,7 @@ public class SimpleCacheTest {
final SimpleCache cache = new SimpleCache<>();
final ConcurrencyTester tester = new ConcurrencyTester(9000);
tester.test(()-> cache.get("aaa", ()-> {
- ThreadUtil.sleep(1000);
+ ThreadUtil.sleep(200);
return "aaaValue";
}));
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/ansi/AnsiEncoderTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/ansi/AnsiEncoderTest.java
new file mode 100755
index 000000000..710c5c0f0
--- /dev/null
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/ansi/AnsiEncoderTest.java
@@ -0,0 +1,13 @@
+package cn.hutool.core.lang.ansi;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class AnsiEncoderTest {
+
+ @Test
+ public void encodeTest(){
+ final String encode = AnsiEncoder.encode(AnsiColor.GREEN, "Hutool test");
+ Assert.assertEquals("\u001B[32mHutool test\u001B[0;39m", encode);
+ }
+}
diff --git a/hutool-core/src/test/java/cn/hutool/core/map/FuncMapTest.java b/hutool-core/src/test/java/cn/hutool/core/map/FuncMapTest.java
new file mode 100755
index 000000000..1a26d127a
--- /dev/null
+++ b/hutool-core/src/test/java/cn/hutool/core/map/FuncMapTest.java
@@ -0,0 +1,22 @@
+package cn.hutool.core.map;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.HashMap;
+
+public class FuncMapTest {
+
+ @Test
+ public void putGetTest(){
+ final FuncMap map = new FuncMap<>(HashMap::new,
+ (key)->key.toString().toLowerCase(),
+ (value)->value.toString().toUpperCase());
+
+ map.put("aaa", "b");
+ map.put("BBB", "c");
+
+ Assert.assertEquals("B", map.get("aaa"));
+ Assert.assertEquals("C", map.get("bbb"));
+ }
+}
diff --git a/hutool-core/src/test/java/cn/hutool/core/map/WeakConcurrentMapTest.java b/hutool-core/src/test/java/cn/hutool/core/map/WeakConcurrentMapTest.java
new file mode 100755
index 000000000..7824d1918
--- /dev/null
+++ b/hutool-core/src/test/java/cn/hutool/core/map/WeakConcurrentMapTest.java
@@ -0,0 +1,52 @@
+package cn.hutool.core.map;
+
+import cn.hutool.core.thread.ConcurrencyTester;
+import cn.hutool.core.thread.ThreadUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.RandomUtil;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class WeakConcurrentMapTest {
+
+ @Test
+ public void putAndGetTest(){
+ final WeakConcurrentMap map = new WeakConcurrentMap<>();
+ Object
+ key1 = new Object(), value1 = new Object(),
+ key2 = new Object(), value2 = new Object(),
+ key3 = new Object(), value3 = new Object(),
+ key4 = new Object(), value4 = new Object();
+ map.put(key1, value1);
+ map.put(key2, value2);
+ map.put(key3, value3);
+ map.put(key4, value4);
+
+ Assert.assertEquals(value1, map.get(key1));
+ Assert.assertEquals(value2, map.get(key2));
+ Assert.assertEquals(value3, map.get(key3));
+ Assert.assertEquals(value4, map.get(key4));
+
+ // 清空引用
+ //noinspection UnusedAssignment
+ key1 = null;
+ //noinspection UnusedAssignment
+ key2 = null;
+
+ System.gc();
+ ThreadUtil.sleep(200L);
+
+ Assert.assertEquals(2, map.size());
+ }
+
+ @Test
+ public void getConcurrencyTest(){
+ final WeakConcurrentMap cache = new WeakConcurrentMap<>();
+ final ConcurrencyTester tester = new ConcurrencyTester(9000);
+ tester.test(()-> cache.computeIfAbsent("aaa" + RandomUtil.randomInt(2), (key)-> "aaaValue"));
+
+ Assert.assertTrue(tester.getInterval() > 0);
+ String value = ObjectUtil.defaultIfNull(cache.get("aaa0"), cache.get("aaa1"));
+ Assert.assertEquals("aaaValue", value);
+ }
+}
diff --git a/hutool-core/src/test/java/cn/hutool/core/text/CharSequenceUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/text/CharSequenceUtilTest.java
index 60e8d8099..2672c628b 100755
--- a/hutool-core/src/test/java/cn/hutool/core/text/CharSequenceUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/text/CharSequenceUtilTest.java
@@ -148,4 +148,16 @@ public class CharSequenceUtilTest {
Assert.assertEquals("ABCde", CharSequenceUtil.removeSuffixIgnoreCase("ABCde", "ABCdef"));
Assert.assertNull(CharSequenceUtil.removeSuffixIgnoreCase(null, "ABCdef"));
}
+
+ @Test
+ public void trimToNullTest(){
+ String a = " ";
+ Assert.assertNull(CharSequenceUtil.trimToNull(a));
+
+ a = "";
+ Assert.assertNull(CharSequenceUtil.trimToNull(a));
+
+ a = null;
+ Assert.assertNull(CharSequenceUtil.trimToNull(a));
+ }
}
diff --git a/hutool-core/src/test/java/cn/hutool/core/text/StrMatcherTest.java b/hutool-core/src/test/java/cn/hutool/core/text/StrMatcherTest.java
index 53720fda8..d5f88f953 100755
--- a/hutool-core/src/test/java/cn/hutool/core/text/StrMatcherTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/text/StrMatcherTest.java
@@ -1,6 +1,5 @@
package cn.hutool.core.text;
-import cn.hutool.core.lang.Console;
import org.junit.Assert;
import org.junit.Test;
@@ -34,7 +33,7 @@ public class StrMatcherTest {
// 当有无匹配项的时候，按照全不匹配对待
final StrMatcher strMatcher = new StrMatcher("${name}经过${year}年");
final Map match = strMatcher.match("小明经过20年，成长为一个大人。");
- Console.log(match);
+ //Console.log(match);
Assert.assertEquals("小明", match.get("name"));
Assert.assertEquals("20", match.get("year"));
}
diff --git a/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvWriterTest.java b/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvWriterTest.java
index e79c9b784..ed4416209 100755
--- a/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvWriterTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvWriterTest.java
@@ -1,10 +1,15 @@
package cn.hutool.core.text.csv;
import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.lang.Console;
import cn.hutool.core.util.CharsetUtil;
import org.junit.Ignore;
import org.junit.Test;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
public class CsvWriterTest {
@Test
@@ -23,4 +28,20 @@ public class CsvWriterTest {
writer.writeLine("李四", "男", "XX市XX区,01号");
writer.close();
}
+
+ @Test
+ @Ignore
+ public void issue2255Test(){
+ String fileName = "D:/test/" + new Random().nextInt(100) + "-a.csv";
+ CsvWriter writer = CsvUtil.getWriter(fileName, CharsetUtil.CHARSET_UTF_8);
+ List list = new ArrayList<>();
+ for (int i = 0; i < 10000; i++) {
+ list.add(i+"");
+ }
+ Console.log("{} : {}", fileName, list.size());
+ for (String s : list) {
+ writer.writeLine(s);
+ }
+ writer.close();
+ }
}
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ArrayUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/ArrayUtilTest.java
index 92f3603a8..de3f0d911 100755
--- a/hutool-core/src/test/java/cn/hutool/core/util/ArrayUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/ArrayUtilTest.java
@@ -285,6 +285,19 @@ public class ArrayUtilTest {
Assert.assertArrayEquals(new String[]{"aa", "bb", "cc", "dd"}, distinct);
}
+ @Test
+ public void distinctByFunctionTest() {
+ String[] array = {"aa", "Aa", "BB", "bb"};
+
+ // 覆盖模式下，保留最后加入的两个元素
+ String[] distinct = ArrayUtil.distinct(array, String::toLowerCase, true);
+ Assert.assertArrayEquals(new String[]{"Aa", "bb"}, distinct);
+
+ // 忽略模式下，保留最早加入的两个元素
+ distinct = ArrayUtil.distinct(array, String::toLowerCase, false);
+ Assert.assertArrayEquals(new String[]{"aa", "BB"}, distinct);
+ }
+
@Test
public void toStingTest() {
int[] a = {1, 3, 56, 6, 7};
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ReflectUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/ReflectUtilTest.java
index 6affbabb6..7792804a8 100755
--- a/hutool-core/src/test/java/cn/hutool/core/util/ReflectUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/ReflectUtilTest.java
@@ -2,6 +2,7 @@ package cn.hutool.core.util;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.date.TimeInterval;
+import cn.hutool.core.date.Week;
import cn.hutool.core.lang.Console;
import cn.hutool.core.lang.test.bean.ExamInfoDict;
import cn.hutool.core.util.ClassUtilTest.TestSubClass;
@@ -12,6 +13,8 @@ import org.junit.Test;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Map;
/**
* 反射工具类单元测试
@@ -202,10 +205,13 @@ public class ReflectUtilTest {
}
interface TestInterface1 {
+ @SuppressWarnings("unused")
void getA();
+ @SuppressWarnings("unused")
void getB();
+ @SuppressWarnings("unused")
default void getC() {
}
@@ -220,6 +226,7 @@ public class ReflectUtilTest {
void get3();
}
+ @SuppressWarnings("InnerClassMayBeStatic")
class C1 implements TestInterface2 {
@Override
@@ -239,4 +246,26 @@ public class ReflectUtilTest {
}
}
+
+ @Test
+ public void newInstanceIfPossibleTest(){
+ //noinspection ConstantConditions
+ int intValue = ReflectUtil.newInstanceIfPossible(int.class);
+ Assert.assertEquals(0, intValue);
+
+ Integer integer = ReflectUtil.newInstanceIfPossible(Integer.class);
+ Assert.assertEquals(new Integer(0), integer);
+
+ Map map = ReflectUtil.newInstanceIfPossible(Map.class);
+ Assert.assertNotNull(map);
+
+ Collection collection = ReflectUtil.newInstanceIfPossible(Collection.class);
+ Assert.assertNotNull(collection);
+
+ Week week = ReflectUtil.newInstanceIfPossible(Week.class);
+ Assert.assertEquals(Week.SUNDAY, week);
+
+ int[] intArray = ReflectUtil.newInstanceIfPossible(int[].class);
+ Assert.assertArrayEquals(new int[0], intArray);
+ }
}
diff --git a/hutool-cron/pom.xml b/hutool-cron/pom.xml
index 51407bb01..a909049f1 100755
--- a/hutool-cron/pom.xml
+++ b/hutool-cron/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.8.0.M3
+ 5.8.0.M4
hutool-cron
diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPattern.java b/hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPattern.java
index 5c0e7cffd..e5c466597 100755
--- a/hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPattern.java
+++ b/hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPattern.java
@@ -5,6 +5,7 @@ import cn.hutool.core.date.CalendarUtil;
import cn.hutool.cron.pattern.matcher.PatternMatcher;
import cn.hutool.cron.pattern.parser.PatternParser;
+import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.GregorianCalendar;
@@ -129,6 +130,18 @@ public class CronPattern {
return match(PatternUtil.getFields(calendar, isMatchSecond));
}
+ /**
+ * 给定时间是否匹配定时任务表达式
+ *
+ * @param dateTime 时间
+ * @param isMatchSecond 是否匹配秒
+ * @return 如果匹配返回 {@code true}, 否则返回 {@code false}
+ * @since 5.8.0
+ */
+ public boolean match(LocalDateTime dateTime, boolean isMatchSecond) {
+ return match(PatternUtil.getFields(dateTime, isMatchSecond));
+ }
+
/**
* 返回匹配到的下一个时间
*
@@ -137,7 +150,7 @@ public class CronPattern {
*/
public Calendar nextMatchAfter(Calendar calendar) {
Calendar next = nextMatchAfter(PatternUtil.getFields(calendar, true), calendar.getTimeZone());
- if(false == match(next, true)){
+ if (false == match(next, true)) {
next.set(Calendar.DAY_OF_MONTH, next.get(Calendar.DAY_OF_MONTH) + 1);
next = CalendarUtil.beginOfDay(next);
return nextMatchAfter(next);
diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/PatternUtil.java b/hutool-cron/src/main/java/cn/hutool/cron/pattern/PatternUtil.java
index 09f82d73a..63030b9de 100755
--- a/hutool-cron/src/main/java/cn/hutool/cron/pattern/PatternUtil.java
+++ b/hutool-cron/src/main/java/cn/hutool/cron/pattern/PatternUtil.java
@@ -1,5 +1,8 @@
package cn.hutool.cron.pattern;
+import cn.hutool.core.date.Week;
+
+import java.time.LocalDateTime;
import java.util.Calendar;
/**
@@ -10,6 +13,26 @@ import java.util.Calendar;
*/
class PatternUtil {
+ /**
+ * 获取处理后的字段列表
+ * 月份从1开始，周从0开始
+ *
+ * @param dateTime {@link Calendar}
+ * @param isMatchSecond 是否匹配秒，{@link false}则秒返回-1
+ * @return 字段值列表
+ * @since 5.8.0
+ */
+ static int[] getFields(LocalDateTime dateTime, boolean isMatchSecond) {
+ final int second = isMatchSecond ? dateTime.getSecond() : -1;
+ final int minute = dateTime.getMinute();
+ final int hour = dateTime.getHour();
+ final int dayOfMonth = dateTime.getDayOfMonth();
+ final int month = dateTime.getMonthValue();// 月份从1开始
+ final int dayOfWeek = Week.of(dateTime.getDayOfWeek()).getValue() - 1; // 星期从0开始，0和7都表示周日
+ final int year = dateTime.getYear();
+ return new int[]{second, minute, hour, dayOfMonth, month, dayOfWeek, year};
+ }
+
/**
* 获取处理后的字段列表
* 月份从1开始，周从0开始
diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/PatternMatcher.java b/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/PatternMatcher.java
index 908154e9b..bfc5712a1 100755
--- a/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/PatternMatcher.java
+++ b/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/PatternMatcher.java
@@ -72,6 +72,17 @@ public class PatternMatcher {
return match(fields[0], fields[1], fields[2], fields[3], fields[4], fields[5], fields[6]);
}
+ /**
+ * 给定周的值是否匹配定时任务表达式对应部分
+ *
+ * @param dayOfWeekValue dayOfMonth值，星期从0开始，0和7都表示周日
+ * @return 如果匹配返回 {@code true}, 否则返回 {@code false}
+ * @since 5.8.0
+ */
+ public boolean matchWeek(int dayOfWeekValue) {
+ return matchers[5].match(dayOfWeekValue);
+ }
+
/**
* 给定时间是否匹配定时任务表达式
*
@@ -88,7 +99,7 @@ public class PatternMatcher {
return ((second < 0) || matchers[0].match(second)) // 匹配秒（非秒匹配模式下始终返回true）
&& matchers[1].match(minute)// 匹配分
&& matchers[2].match(hour)// 匹配时
- && isMatchDayOfMonth(matchers[3], dayOfMonth, month, Year.isLeap(year))// 匹配日
+ && matchDayOfMonth(matchers[3], dayOfMonth, month, Year.isLeap(year))// 匹配日
&& matchers[4].match(month) // 匹配月
&& matchers[5].match(dayOfWeek)// 匹配周
&& matchers[6].match(year);// 匹配年
@@ -103,7 +114,7 @@ public class PatternMatcher {
* @param isLeapYear 是否闰年
* @return 是否匹配
*/
- private static boolean isMatchDayOfMonth(PartMatcher matcher, int dayOfMonth, int month, boolean isLeapYear) {
+ private static boolean matchDayOfMonth(PartMatcher matcher, int dayOfMonth, int month, boolean isLeapYear) {
return ((matcher instanceof DayOfMonthMatcher) //
? ((DayOfMonthMatcher) matcher).match(dayOfMonth, month, isLeapYear) //
: matcher.match(dayOfMonth));
diff --git a/hutool-crypto/pom.xml b/hutool-crypto/pom.xml
index 4585a82ed..78413bf0d 100755
--- a/hutool-crypto/pom.xml
+++ b/hutool-crypto/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.8.0.M3
+ 5.8.0.M4
hutool-crypto
diff --git a/hutool-db/pom.xml b/hutool-db/pom.xml
index 888c5c678..2cfc0667c 100755
--- a/hutool-db/pom.xml
+++ b/hutool-db/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.8.0.M3
+ 5.8.0.M4
hutool-db
@@ -20,14 +20,14 @@
0.9.5.5
2.9.0
- 10.0.16
- 1.2.8
+ 10.0.20
+ 1.2.9
2.4.13
- 4.5.0
+ 4.6.0
3.36.0.3
2.5.2
- 4.2.1
+ 4.2.2
@@ -81,7 +81,7 @@
com.github.chris2018998
beecp
- 3.3.4
+ 3.3.5
slf4j-api
@@ -142,13 +142,13 @@
mysql
mysql-connector-java
- 8.0.28
+ 8.0.29
test
org.postgresql
postgresql
- 42.3.3
+ 42.3.4
test
@@ -166,7 +166,7 @@
+