, Hash32 {
+
+ @Override
+ public long hash64(String key) {
+ byte[] bKey = md5(key);
+ return ((long) (bKey[3] & 0xFF) << 24)
+ | ((long) (bKey[2] & 0xFF) << 16)
+ | ((long) (bKey[1] & 0xFF) << 8)
+ | (bKey[0] & 0xFF);
+ }
+
+ @Override
+ public int hash32(String key) {
+ return (int) (hash64(key) & 0xffffffffL);
+ }
+
+ @Override
+ public Number hash(String key) {
+ return hash64(key);
+ }
+
+ /**
+ * 计算MD5值，使用UTF-8编码
+ *
+ * @param key 被计算的键
+ * @return MD5值
+ */
+ private static byte[] md5(String key) {
+ final MessageDigest md5;
+ try {
+ md5 = MessageDigest.getInstance("MD5");
+ } catch (NoSuchAlgorithmException e) {
+ throw new UtilException("MD5 algorithm not suooport!", e);
+ }
+ return md5.digest(StrUtil.utf8Bytes(key));
+ }
+}
diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/reflect/MethodHandleUtil.java b/hutool-core/src/main/java/cn/hutool/core/lang/reflect/MethodHandleUtil.java
index 781208744..fbfa2ded3 100755
--- a/hutool-core/src/main/java/cn/hutool/core/lang/reflect/MethodHandleUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/lang/reflect/MethodHandleUtil.java
@@ -12,6 +12,7 @@ import java.lang.reflect.Method;
/**
* 方法句柄{@link MethodHandle}封装工具类
+ * 方法句柄是一个有类型的，可以直接执行的指向底层方法、构造器、field等的引用，可以简单理解为函数指针，它是一种更加底层的查找、调整和调用方法的机制。
* 参考：
*
* - https://stackoverflow.com/questions/22614746/how-do-i-invoke-java-8-default-methods-reflectively
@@ -113,7 +114,7 @@ public class MethodHandleUtil {
}
/**
- * 执行接口或对象中的方法
+ * 执行接口或对象中的特殊方法（private、static等）
*
*
* interface Duck {
@@ -159,7 +160,7 @@ public class MethodHandleUtil {
}
/**
- * 执行接口或对象中的方法
+ * 执行接口或对象中的特殊方法（private、static等）
*
*
* interface Duck {
diff --git a/hutool-core/src/main/java/cn/hutool/core/map/CustomKeyMap.java b/hutool-core/src/main/java/cn/hutool/core/map/CustomKeyMap.java
index 66c79de78..4584943a5 100644
--- a/hutool-core/src/main/java/cn/hutool/core/map/CustomKeyMap.java
+++ b/hutool-core/src/main/java/cn/hutool/core/map/CustomKeyMap.java
@@ -1,6 +1,7 @@
package cn.hutool.core.map;
import java.util.Map;
+import java.util.function.BiFunction;
/**
* 自定义键的Map，默认HashMap实现
@@ -67,6 +68,31 @@ public abstract class CustomKeyMap extends MapWrapper {
return super.replace((K) customKey(key), value);
}
+ //---------------------------------------------------------------------------- Override default methods start
+ @Override
+ public V getOrDefault(Object key, V defaultValue) {
+ return super.getOrDefault(customKey(key), defaultValue);
+ }
+
+ @Override
+ public V computeIfPresent(K key, BiFunction remappingFunction) {
+ //noinspection unchecked
+ return super.computeIfPresent((K) customKey(key), remappingFunction);
+ }
+
+ @Override
+ public V compute(K key, BiFunction remappingFunction) {
+ //noinspection unchecked
+ return super.compute((K) customKey(key), remappingFunction);
+ }
+
+ @Override
+ public V merge(K key, V value, BiFunction remappingFunction) {
+ //noinspection unchecked
+ return super.merge((K) customKey(key), value, remappingFunction);
+ }
+ //---------------------------------------------------------------------------- Override default methods end
+
/**
* 自定义键
*
diff --git a/hutool-core/src/main/java/cn/hutool/core/map/MapWrapper.java b/hutool-core/src/main/java/cn/hutool/core/map/MapWrapper.java
index f1e40316a..000b15ea6 100644
--- a/hutool-core/src/main/java/cn/hutool/core/map/MapWrapper.java
+++ b/hutool-core/src/main/java/cn/hutool/core/map/MapWrapper.java
@@ -16,7 +16,6 @@ import java.util.function.Function;
* @param 键类型
* @param 值类型
* @author looly
- * @author looly
* @since 4.3.3
*/
public class MapWrapper implements Map, Iterable>, Serializable, Cloneable {
@@ -179,6 +178,7 @@ public class MapWrapper implements Map, Iterable>, S
return raw.computeIfAbsent(key, mappingFunction);
}
+ // 重写默认方法的意义在于，如果被包装的Map自定义了这些默认方法，包装类就可以保持这些行为的一致性
//---------------------------------------------------------------------------- Override default methods start
@Override
public V getOrDefault(Object key, V defaultValue) {
diff --git a/hutool-core/src/main/java/cn/hutool/core/stream/CollectorUtil.java b/hutool-core/src/main/java/cn/hutool/core/stream/CollectorUtil.java
index 58b03d2ba..55e96877c 100644
--- a/hutool-core/src/main/java/cn/hutool/core/stream/CollectorUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/stream/CollectorUtil.java
@@ -1,10 +1,17 @@
package cn.hutool.core.stream;
+import cn.hutool.core.lang.Opt;
import cn.hutool.core.util.StrUtil;
import java.util.Collections;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
import java.util.StringJoiner;
+import java.util.function.BiConsumer;
+import java.util.function.BinaryOperator;
import java.util.function.Function;
+import java.util.function.Supplier;
import java.util.stream.Collector;
/**
@@ -61,4 +68,70 @@ public class CollectorUtil {
Collections.emptySet()
);
}
+
+
+ /**
+ * 提供对null值友好的groupingBy操作的{@link Collector}实现，可指定map类型
+ *
+ * @param classifier 分组依据
+ * @param mapFactory 提供的map
+ * @param downstream 下游操作
+ * @param 实体类型
+ * @param 实体中的分组依据对应类型，也是Map中key的类型
+ * @param 下游操作对应返回类型，也是Map中value的类型
+ * @param 下游操作在进行中间操作时对应类型
+ * @param 最后返回结果Map类型
+ * @return {@link Collector}
+ */
+ public static > Collector groupingBy(Function classifier,
+ Supplier mapFactory,
+ Collector downstream) {
+ Supplier downstreamSupplier = downstream.supplier();
+ BiConsumer downstreamAccumulator = downstream.accumulator();
+ BiConsumer, T> accumulator = (m, t) -> {
+ K key = Opt.ofNullable(t).map(classifier).orElse(null);
+ A container = m.computeIfAbsent(key, k -> downstreamSupplier.get());
+ downstreamAccumulator.accept(container, t);
+ };
+ BinaryOperator> merger = (m1, m2) -> {
+ for (Map.Entry e : m2.entrySet()) {
+ m1.merge(e.getKey(), e.getValue(), downstream.combiner());
+ }
+ return m1;
+ };
+ @SuppressWarnings("unchecked")
+ Supplier> mangledFactory = (Supplier>) mapFactory;
+
+ if (downstream.characteristics().contains(Collector.Characteristics.IDENTITY_FINISH)) {
+ return new SimpleCollector<>(mangledFactory, accumulator, merger, Collections.unmodifiableSet(EnumSet.of(Collector.Characteristics.IDENTITY_FINISH)));
+ } else {
+ @SuppressWarnings("unchecked")
+ Function downstreamFinisher = (Function) downstream.finisher();
+ Function, M> finisher = intermediate -> {
+ intermediate.replaceAll((k, v) -> downstreamFinisher.apply(v));
+ @SuppressWarnings("unchecked")
+ M castResult = (M) intermediate;
+ return castResult;
+ };
+ return new SimpleCollector<>(mangledFactory, accumulator, merger, finisher, Collections.emptySet());
+ }
+ }
+
+ /**
+ * 提供对null值友好的groupingBy操作的{@link Collector}实现
+ *
+ * @param classifier 分组依据
+ * @param downstream 下游操作
+ * @param 实体类型
+ * @param 实体中的分组依据对应类型，也是Map中key的类型
+ * @param 下游操作对应返回类型，也是Map中value的类型
+ * @param 下游操作在进行中间操作时对应类型
+ * @return {@link Collector}
+ */
+ public static
+ Collector> groupingBy(Function classifier,
+ Collector downstream) {
+ return groupingBy(classifier, HashMap::new, downstream);
+ }
+
}
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvBaseReader.java b/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvBaseReader.java
index db8d62e4c..84a244e37 100644
--- a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvBaseReader.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvBaseReader.java
@@ -49,7 +49,7 @@ public class CsvBaseReader implements Serializable {
* @param config 配置项
*/
public CsvBaseReader(CsvReadConfig config) {
- this.config = ObjectUtil.defaultIfNull(config, CsvReadConfig.defaultConfig());
+ this.config = ObjectUtil.defaultIfNull(config, CsvReadConfig::defaultConfig);
}
//--------------------------------------------------------------------------------------------- Constructor end
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvParser.java b/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvParser.java
index 02feadee3..21d996039 100644
--- a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvParser.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvParser.java
@@ -80,7 +80,7 @@ public final class CsvParser extends ComputeIter implements Closeable, S
*/
public CsvParser(final Reader reader, CsvReadConfig config) {
this.reader = Objects.requireNonNull(reader, "reader must not be null");
- this.config = ObjectUtil.defaultIfNull(config, CsvReadConfig.defaultConfig());
+ this.config = ObjectUtil.defaultIfNull(config, CsvReadConfig::defaultConfig);
}
/**
diff --git a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvWriter.java b/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvWriter.java
index 9b0155be6..878011082 100644
--- a/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvWriter.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/csv/CsvWriter.java
@@ -149,7 +149,7 @@ public final class CsvWriter implements Closeable, Flushable, Serializable {
*/
public CsvWriter(Writer writer, CsvWriteConfig config) {
this.writer = (writer instanceof BufferedWriter) ? writer : new BufferedWriter(writer);
- this.config = ObjectUtil.defaultIfNull(config, CsvWriteConfig.defaultConfig());
+ this.config = ObjectUtil.defaultIfNull(config, CsvWriteConfig::defaultConfig);
}
// --------------------------------------------------------------------------------------------------- Constructor end
diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/ExecutorBuilder.java b/hutool-core/src/main/java/cn/hutool/core/thread/ExecutorBuilder.java
index 418e67068..bdd5c95ca 100644
--- a/hutool-core/src/main/java/cn/hutool/core/thread/ExecutorBuilder.java
+++ b/hutool-core/src/main/java/cn/hutool/core/thread/ExecutorBuilder.java
@@ -242,7 +242,7 @@ public class ExecutorBuilder implements Builder {
workQueue = (corePoolSize <= 0) ? new SynchronousQueue<>() : new LinkedBlockingQueue<>(DEFAULT_QUEUE_CAPACITY);
}
final ThreadFactory threadFactory = (null != builder.threadFactory) ? builder.threadFactory : Executors.defaultThreadFactory();
- RejectedExecutionHandler handler = ObjectUtil.defaultIfNull(builder.handler, new ThreadPoolExecutor.AbortPolicy());
+ RejectedExecutionHandler handler = ObjectUtil.defaultIfNull(builder.handler, ThreadPoolExecutor.AbortPolicy::new);
final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(//
corePoolSize, //
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ObjectUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/ObjectUtil.java
index eeab6d5fc..8fe082b43 100644
--- a/hutool-core/src/main/java/cn/hutool/core/util/ObjectUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/ObjectUtil.java
@@ -295,6 +295,22 @@ public class ObjectUtil {
return isNull(object) ? defaultValue : object;
}
+ /**
+ * 如果被检查对象为 {@code null}， 返回默认值（由 defaultValueSupplier 提供）；否则直接返回
+ *
+ * @param source 被检查对象
+ * @param defaultValueSupplier 默认值提供者
+ * @param 对象类型
+ * @return 被检查对象为{@code null}返回默认值，否则返回自定义handle处理后的返回值
+ * @throws NullPointerException {@code defaultValueSupplier == null} 时，抛出
+ * @since 5.7.20
+ */
+ public static T defaultIfNull(T source, Supplier defaultValueSupplier) {
+ if (isNull(source)) {
+ return defaultValueSupplier.get();
+ }
+ return source;
+ }
/**
* 如果给定对象为{@code null} 返回默认值, 如果不为null 返回自定义handle处理后的返回值
@@ -351,6 +367,23 @@ public class ObjectUtil {
return StrUtil.isEmpty(str) ? defaultValue : str;
}
+ /**
+ * 如果被检查对象为 {@code null} 或 "" 时，返回默认值（由 defaultValueSupplier 提供）；否则直接返回
+ *
+ * @param str 被检查对象
+ * @param defaultValueSupplier 默认值提供者
+ * @param 对象类型（必须实现CharSequence接口）
+ * @return 被检查对象为{@code null}返回默认值，否则返回自定义handle处理后的返回值
+ * @throws NullPointerException {@code defaultValueSupplier == null} 时，抛出
+ * @since 5.7.20
+ */
+ public static T defaultIfEmpty(T str, Supplier defaultValueSupplier) {
+ if (StrUtil.isEmpty(str)) {
+ return defaultValueSupplier.get();
+ }
+ return str;
+ }
+
/**
* 如果给定对象为{@code null}或者""或者空白符返回默认值
*
@@ -372,6 +405,23 @@ public class ObjectUtil {
return StrUtil.isBlank(str) ? defaultValue : str;
}
+ /**
+ * 如果被检查对象为 {@code null} 或 "" 或 空白字符串时，返回默认值（由 defaultValueSupplier 提供）；否则直接返回
+ *
+ * @param str 被检查对象
+ * @param defaultValueSupplier 默认值提供者
+ * @param 对象类型（必须实现CharSequence接口）
+ * @return 被检查对象为{@code null}返回默认值，否则返回自定义handle处理后的返回值
+ * @throws NullPointerException {@code defaultValueSupplier == null} 时，抛出
+ * @since 5.7.20
+ */
+ public static T defaultIfBlank(T str, Supplier defaultValueSupplier) {
+ if (StrUtil.isBlank(str)) {
+ return defaultValueSupplier.get();
+ }
+ return str;
+ }
+
/**
* 克隆对象
* 如果对象实现Cloneable接口，调用其clone方法
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 b0f9b1d7f..6f3176433 100644
--- a/hutool-core/src/main/java/cn/hutool/core/util/ReflectUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/ReflectUtil.java
@@ -344,6 +344,17 @@ public class ReflectUtil {
}
}
+ /**
+ * 是否为父类引用字段
+ * 当字段所在类是对象子类时（对象中定义的非static的class），会自动生成一个以"this$0"为名称的字段，指向父类对象
+ * @param field 字段
+ * @return 是否为父类引用字段
+ * @since 5.7.20
+ */
+ public static boolean isOuterClassField(Field field){
+ return "this$0".equals(field.getName());
+ }
+
// --------------------------------------------------------------------------------------------------------- method
/**
@@ -673,11 +684,12 @@ public class ReflectUtil {
* @return 是否为equals方法
*/
public static boolean isEqualsMethod(Method method) {
- if (method == null || false == "equals".equals(method.getName())) {
+ if (method == null ||
+ 1 != method.getParameterCount() ||
+ false == "equals".equals(method.getName())) {
return false;
}
- final Class[] paramTypes = method.getParameterTypes();
- return (1 == paramTypes.length && paramTypes[0] == Object.class);
+ return (method.getParameterTypes()[0] == Object.class);
}
/**
@@ -712,9 +724,67 @@ public class ReflectUtil {
* @since 5.1.1
*/
public static boolean isEmptyParam(Method method) {
- return method.getParameterTypes().length == 0;
+ return method.getParameterCount() == 0;
}
+ /**
+ * 检查给定方法是否为Getter或者Setter方法，规则为：
+ *
+ * - 方法参数必须为0个或1个
+ * - 如果是无参方法，则判断是否以“get”或“is”开头
+ * - 如果方法参数1个，则判断是否以“set”开头
+ *
+ *
+ * @param method 方法
+ * @return 是否为Getter或者Setter方法
+ * @since 5.7.20
+ */
+ public static boolean isGetterOrSetterIgnoreCase(Method method) {
+ return isGetterOrSetter(method, true);
+ }
+
+ /**
+ * 检查给定方法是否为Getter或者Setter方法，规则为：
+ *
+ * - 方法参数必须为0个或1个
+ * - 方法名称不能是getClass
+ * - 如果是无参方法，则判断是否以“get”或“is”开头
+ * - 如果方法参数1个，则判断是否以“set”开头
+ *
+ *
+ * @param method 方法
+ * @param ignoreCase 是否忽略方法名的大小写
+ * @return 是否为Getter或者Setter方法
+ * @since 5.7.20
+ */
+ public static boolean isGetterOrSetter(Method method, boolean ignoreCase) {
+ if (null == method) {
+ return false;
+ }
+
+ // 参数个数必须为0或1
+ final int parameterCount = method.getParameterCount();
+ if (parameterCount > 1) {
+ return false;
+ }
+
+ String name = method.getName();
+ // 跳过getClass这个特殊方法
+ if("getClass".equals(name)){
+ return false;
+ }
+ if(ignoreCase){
+ name = name.toLowerCase();
+ }
+ switch (parameterCount) {
+ case 0:
+ return name.startsWith("get") || name.startsWith("is");
+ case 1:
+ return name.startsWith("set");
+ default:
+ return false;
+ }
+ }
// --------------------------------------------------------------------------------------------------------- newInstance
/**
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ServiceLoaderUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/ServiceLoaderUtil.java
index 7c28c655b..d04807d5f 100644
--- a/hutool-core/src/main/java/cn/hutool/core/util/ServiceLoaderUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/ServiceLoaderUtil.java
@@ -76,7 +76,7 @@ public class ServiceLoaderUtil {
* @return 服务接口实现列表
*/
public static ServiceLoader load(Class clazz, ClassLoader loader) {
- return ServiceLoader.load(clazz, ObjectUtil.defaultIfNull(loader, ClassLoaderUtil.getClassLoader()));
+ return ServiceLoader.load(clazz, ObjectUtil.defaultIfNull(loader, ClassLoaderUtil::getClassLoader));
}
/**
diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/Issue2082Test.java b/hutool-core/src/test/java/cn/hutool/core/bean/Issue2082Test.java
new file mode 100755
index 000000000..ae8920f16
--- /dev/null
+++ b/hutool-core/src/test/java/cn/hutool/core/bean/Issue2082Test.java
@@ -0,0 +1,33 @@
+package cn.hutool.core.bean;
+
+import lombok.Data;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * https://github.com/dromara/hutool/issues/2082
+ * 当setXXX有重载方法的时候，BeanDesc中会匹配到重载方法，增加类型检查来规避之
+ */
+public class Issue2082Test {
+
+ @Test
+ public void toBeanTest() {
+ TestBean2 testBean2 = new TestBean2();
+ TestBean test = BeanUtil.toBean(testBean2, TestBean.class);
+ Assert.assertNull(test.getId());
+ }
+
+ @Data
+ static class TestBean {
+ private Long id;
+
+ public void setId(String id) {
+ this.id = Long.valueOf(id);
+ }
+ }
+
+ @Data
+ static class TestBean2 {
+ private String id;
+ }
+}
diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/CollStreamUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/CollStreamUtilTest.java
index 63d5faa56..7c95075af 100644
--- a/hutool-core/src/test/java/cn/hutool/core/collection/CollStreamUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/collection/CollStreamUtilTest.java
@@ -203,6 +203,20 @@ public class CollStreamUtilTest {
groupThen);
// 总之，如果你是想要group分组后还要进行别的操作，用它就对了！
+ // 并且对null值进行了友好处理，例如
+ List students = Arrays.asList(null, null, new Student(1, 1, 1, "张三"),
+ new Student(1, 2, 1, "李四"));
+ Map> termIdStudentsMap = CollStreamUtil.groupBy(students, Student::getTermId, Collectors.toList());
+ Map> termIdStudentsCompareMap = new HashMap<>();
+ termIdStudentsCompareMap.put(null, Arrays.asList(null, null));
+ termIdStudentsCompareMap.put(1L, Arrays.asList(new Student(1L, 1, 1, "张三"), new Student(1L, 2, 1, "李四")));
+ Assert.assertEquals(termIdStudentsCompareMap, termIdStudentsMap);
+
+ Map termIdCountMap = CollStreamUtil.groupBy(students, Student::getTermId, Collectors.counting());
+ Map termIdCountCompareMap = new HashMap<>();
+ termIdCountCompareMap.put(null, 2L);
+ termIdCountCompareMap.put(1L, 2L);
+ Assert.assertEquals(termIdCountCompareMap, termIdCountMap);
}
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/ValidatorTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/ValidatorTest.java
index 652985986..d4dd14272 100644
--- a/hutool-core/src/test/java/cn/hutool/core/lang/ValidatorTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/ValidatorTest.java
@@ -162,9 +162,18 @@ public class ValidatorTest {
@Test
public void isChineseTest(){
Assert.assertTrue(Validator.isChinese("全都是中文"));
+ Assert.assertTrue(Validator.isChinese("㐓㐘"));
Assert.assertFalse(Validator.isChinese("not全都是中文"));
}
+ @Test
+ public void hasChineseTest() {
+ Assert.assertTrue(Validator.hasChinese("黄单桑米"));
+ Assert.assertTrue(Validator.hasChinese("Kn 四兄弟"));
+ Assert.assertTrue(Validator.hasChinese("\uD840\uDDA3"));
+ Assert.assertFalse(Validator.hasChinese("Abc"));
+ }
+
@Test
public void isUUIDTest(){
Assert.assertTrue(Validator.isUUID(IdUtil.randomUUID()));
diff --git a/hutool-core/src/test/java/cn/hutool/core/map/CaseInsensitiveMapTest.java b/hutool-core/src/test/java/cn/hutool/core/map/CaseInsensitiveMapTest.java
index b07d4b6db..a62372f12 100644
--- a/hutool-core/src/test/java/cn/hutool/core/map/CaseInsensitiveMapTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/map/CaseInsensitiveMapTest.java
@@ -1,10 +1,11 @@
package cn.hutool.core.map;
+import cn.hutool.core.lang.Pair;
import org.junit.Assert;
import org.junit.Test;
public class CaseInsensitiveMapTest {
-
+
@Test
public void caseInsensitiveMapTest() {
CaseInsensitiveMap map = new CaseInsensitiveMap<>();
@@ -12,7 +13,7 @@ public class CaseInsensitiveMapTest {
Assert.assertEquals("OK", map.get("aaa"));
Assert.assertEquals("OK", map.get("AAA"));
}
-
+
@Test
public void caseInsensitiveLinkedMapTest() {
CaseInsensitiveLinkedMap map = new CaseInsensitiveLinkedMap<>();
@@ -20,4 +21,16 @@ public class CaseInsensitiveMapTest {
Assert.assertEquals("OK", map.get("aaa"));
Assert.assertEquals("OK", map.get("AAA"));
}
+
+ @Test
+ public void mergeTest(){
+ //https://github.com/dromara/hutool/issues/2086
+ Pair b = new Pair<>("a", "value");
+ Pair a = new Pair<>("A", "value");
+ final CaseInsensitiveMap map = new CaseInsensitiveMap<>();
+ map.merge(b.getKey(), b.getValue(), (A, B) -> A);
+ map.merge(a.getKey(), a.getValue(), (A, B) -> A);
+
+ Assert.assertEquals(1, map.size());
+ }
}
diff --git a/hutool-cron/pom.xml b/hutool-cron/pom.xml
index ba2fdbfd2..d95c455b4 100644
--- a/hutool-cron/pom.xml
+++ b/hutool-cron/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.7.19
+ 5.7.20-SNAPSHOT
hutool-cron
diff --git a/hutool-crypto/pom.xml b/hutool-crypto/pom.xml
index 46da18d6b..50f7356ac 100644
--- a/hutool-crypto/pom.xml
+++ b/hutool-crypto/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.7.19
+ 5.7.20-SNAPSHOT
hutool-crypto
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/SecureUtil.java b/hutool-crypto/src/main/java/cn/hutool/crypto/SecureUtil.java
index 2353195aa..575cbb377 100644
--- a/hutool-crypto/src/main/java/cn/hutool/crypto/SecureUtil.java
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/SecureUtil.java
@@ -3,7 +3,6 @@ package cn.hutool.crypto;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.lang.Validator;
-import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.HexUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.asymmetric.AsymmetricAlgorithm;
@@ -830,7 +829,7 @@ public class SecureUtil {
* @since 3.3.0
*/
public static Sign sign(SignAlgorithm algorithm) {
- return new Sign(algorithm);
+ return SignUtil.sign(algorithm);
}
/**
@@ -845,7 +844,7 @@ public class SecureUtil {
* @since 3.3.0
*/
public static Sign sign(SignAlgorithm algorithm, String privateKeyBase64, String publicKeyBase64) {
- return new Sign(algorithm, privateKeyBase64, publicKeyBase64);
+ return SignUtil.sign(algorithm, privateKeyBase64, publicKeyBase64);
}
/**
@@ -860,7 +859,7 @@ public class SecureUtil {
* @since 3.3.0
*/
public static Sign sign(SignAlgorithm algorithm, byte[] privateKey, byte[] publicKey) {
- return new Sign(algorithm, privateKey, publicKey);
+ return SignUtil.sign(algorithm, privateKey, publicKey);
}
/**
@@ -875,7 +874,7 @@ public class SecureUtil {
* @since 4.0.1
*/
public static String signParams(SymmetricCrypto crypto, Map params, String... otherParams) {
- return signParams(crypto, params, StrUtil.EMPTY, StrUtil.EMPTY, true, otherParams);
+ return SignUtil.signParams(crypto, params, otherParams);
}
/**
@@ -893,7 +892,7 @@ public class SecureUtil {
*/
public static String signParams(SymmetricCrypto crypto, Map params, String separator,
String keyValueSeparator, boolean isIgnoreNull, String... otherParams) {
- return crypto.encryptHex(MapUtil.sortJoin(params, separator, keyValueSeparator, isIgnoreNull, otherParams));
+ return SignUtil.signParams(crypto, params, separator, keyValueSeparator, isIgnoreNull, otherParams);
}
/**
@@ -907,7 +906,7 @@ public class SecureUtil {
* @since 4.0.1
*/
public static String signParamsMd5(Map params, String... otherParams) {
- return signParams(DigestAlgorithm.MD5, params, otherParams);
+ return SignUtil.signParamsMd5(params, otherParams);
}
/**
@@ -921,7 +920,7 @@ public class SecureUtil {
* @since 4.0.8
*/
public static String signParamsSha1(Map params, String... otherParams) {
- return signParams(DigestAlgorithm.SHA1, params, otherParams);
+ return SignUtil.signParamsSha1(params, otherParams);
}
/**
@@ -935,7 +934,7 @@ public class SecureUtil {
* @since 4.0.1
*/
public static String signParamsSha256(Map params, String... otherParams) {
- return signParams(DigestAlgorithm.SHA256, params, otherParams);
+ return SignUtil.signParamsSha256(params, otherParams);
}
/**
@@ -950,7 +949,7 @@ public class SecureUtil {
* @since 4.0.1
*/
public static String signParams(DigestAlgorithm digestAlgorithm, Map params, String... otherParams) {
- return signParams(digestAlgorithm, params, StrUtil.EMPTY, StrUtil.EMPTY, true, otherParams);
+ return SignUtil.signParams(digestAlgorithm, params, otherParams);
}
/**
@@ -968,7 +967,7 @@ public class SecureUtil {
*/
public static String signParams(DigestAlgorithm digestAlgorithm, Map params, String separator,
String keyValueSeparator, boolean isIgnoreNull, String... otherParams) {
- return new Digester(digestAlgorithm).digestHex(MapUtil.sortJoin(params, separator, keyValueSeparator, isIgnoreNull, otherParams));
+ return SignUtil.signParams(digestAlgorithm, params, separator, keyValueSeparator, isIgnoreNull, otherParams);
}
/**
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/SignUtil.java b/hutool-crypto/src/main/java/cn/hutool/crypto/SignUtil.java
new file mode 100755
index 000000000..a7a3690ba
--- /dev/null
+++ b/hutool-crypto/src/main/java/cn/hutool/crypto/SignUtil.java
@@ -0,0 +1,176 @@
+package cn.hutool.crypto;
+
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.crypto.asymmetric.Sign;
+import cn.hutool.crypto.asymmetric.SignAlgorithm;
+import cn.hutool.crypto.digest.DigestAlgorithm;
+import cn.hutool.crypto.digest.Digester;
+import cn.hutool.crypto.symmetric.SymmetricCrypto;
+
+import java.util.Map;
+
+/**
+ * 签名工具类
+ * 封装包括：
+ *
+ * - 非堆成签名，签名算法支持见{@link SignAlgorithm}
+ * - 对称签名，支持Map类型参数排序后签名
+ * - 摘要签名，支持Map类型参数排序后签名，签名方法见：{@link DigestAlgorithm}
+ *
+ *
+ * @author looly
+ * @since 5.7.20
+ */
+public class SignUtil {
+
+ /**
+ * 创建签名算法对象
+ * 生成新的私钥公钥对
+ *
+ * @param algorithm 签名算法
+ * @return {@link Sign}
+ * @since 3.3.0
+ */
+ public static Sign sign(SignAlgorithm algorithm) {
+ return new Sign(algorithm);
+ }
+
+ /**
+ * 创建签名算法对象
+ * 私钥和公钥同时为空时生成一对新的私钥和公钥
+ * 私钥和公钥可以单独传入一个，如此则只能使用此钥匙来做签名或验证
+ *
+ * @param algorithm 签名算法
+ * @param privateKeyBase64 私钥Base64
+ * @param publicKeyBase64 公钥Base64
+ * @return {@link Sign}
+ * @since 3.3.0
+ */
+ public static Sign sign(SignAlgorithm algorithm, String privateKeyBase64, String publicKeyBase64) {
+ return new Sign(algorithm, privateKeyBase64, publicKeyBase64);
+ }
+
+ /**
+ * 创建Sign算法对象
+ * 私钥和公钥同时为空时生成一对新的私钥和公钥
+ * 私钥和公钥可以单独传入一个，如此则只能使用此钥匙来做签名或验证
+ *
+ * @param algorithm 算法枚举
+ * @param privateKey 私钥
+ * @param publicKey 公钥
+ * @return {@link Sign}
+ * @since 3.3.0
+ */
+ public static Sign sign(SignAlgorithm algorithm, byte[] privateKey, byte[] publicKey) {
+ return new Sign(algorithm, privateKey, publicKey);
+ }
+
+ /**
+ * 对参数做签名
+ * 参数签名为对Map参数按照key的顺序排序后拼接为字符串，然后根据提供的签名算法生成签名字符串
+ * 拼接后的字符串键值对之间无符号，键值对之间无符号，忽略null值
+ *
+ * @param crypto 对称加密算法
+ * @param params 参数
+ * @param otherParams 其它附加参数字符串（例如密钥）
+ * @return 签名
+ * @since 4.0.1
+ */
+ public static String signParams(SymmetricCrypto crypto, Map params, String... otherParams) {
+ return signParams(crypto, params, StrUtil.EMPTY, StrUtil.EMPTY, true, otherParams);
+ }
+
+ /**
+ * 对参数做签名
+ * 参数签名为对Map参数按照key的顺序排序后拼接为字符串，然后根据提供的签名算法生成签名字符串
+ *
+ * @param crypto 对称加密算法
+ * @param params 参数
+ * @param separator entry之间的连接符
+ * @param keyValueSeparator kv之间的连接符
+ * @param isIgnoreNull 是否忽略null的键和值
+ * @param otherParams 其它附加参数字符串（例如密钥）
+ * @return 签名
+ * @since 4.0.1
+ */
+ public static String signParams(SymmetricCrypto crypto, Map params, String separator,
+ String keyValueSeparator, boolean isIgnoreNull, String... otherParams) {
+ return crypto.encryptHex(MapUtil.sortJoin(params, separator, keyValueSeparator, isIgnoreNull, otherParams));
+ }
+
+ /**
+ * 对参数做md5签名
+ * 参数签名为对Map参数按照key的顺序排序后拼接为字符串，然后根据提供的签名算法生成签名字符串
+ * 拼接后的字符串键值对之间无符号，键值对之间无符号，忽略null值
+ *
+ * @param params 参数
+ * @param otherParams 其它附加参数字符串（例如密钥）
+ * @return 签名
+ * @since 4.0.1
+ */
+ public static String signParamsMd5(Map params, String... otherParams) {
+ return signParams(DigestAlgorithm.MD5, params, otherParams);
+ }
+
+ /**
+ * 对参数做Sha1签名
+ * 参数签名为对Map参数按照key的顺序排序后拼接为字符串，然后根据提供的签名算法生成签名字符串
+ * 拼接后的字符串键值对之间无符号，键值对之间无符号，忽略null值
+ *
+ * @param params 参数
+ * @param otherParams 其它附加参数字符串（例如密钥）
+ * @return 签名
+ * @since 4.0.8
+ */
+ public static String signParamsSha1(Map params, String... otherParams) {
+ return signParams(DigestAlgorithm.SHA1, params, otherParams);
+ }
+
+ /**
+ * 对参数做Sha256签名
+ * 参数签名为对Map参数按照key的顺序排序后拼接为字符串，然后根据提供的签名算法生成签名字符串
+ * 拼接后的字符串键值对之间无符号，键值对之间无符号，忽略null值
+ *
+ * @param params 参数
+ * @param otherParams 其它附加参数字符串（例如密钥）
+ * @return 签名
+ * @since 4.0.1
+ */
+ public static String signParamsSha256(Map params, String... otherParams) {
+ return signParams(DigestAlgorithm.SHA256, params, otherParams);
+ }
+
+ /**
+ * 对参数做签名
+ * 参数签名为对Map参数按照key的顺序排序后拼接为字符串，然后根据提供的签名算法生成签名字符串
+ * 拼接后的字符串键值对之间无符号，键值对之间无符号，忽略null值
+ *
+ * @param digestAlgorithm 摘要算法
+ * @param params 参数
+ * @param otherParams 其它附加参数字符串（例如密钥）
+ * @return 签名
+ * @since 4.0.1
+ */
+ public static String signParams(DigestAlgorithm digestAlgorithm, Map params, String... otherParams) {
+ return signParams(digestAlgorithm, params, StrUtil.EMPTY, StrUtil.EMPTY, true, otherParams);
+ }
+
+ /**
+ * 对参数做签名
+ * 参数签名为对Map参数按照key的顺序排序后拼接为字符串，然后根据提供的签名算法生成签名字符串
+ *
+ * @param digestAlgorithm 摘要算法
+ * @param params 参数
+ * @param separator entry之间的连接符
+ * @param keyValueSeparator kv之间的连接符
+ * @param isIgnoreNull 是否忽略null的键和值
+ * @param otherParams 其它附加参数字符串（例如密钥）
+ * @return 签名
+ * @since 4.0.1
+ */
+ public static String signParams(DigestAlgorithm digestAlgorithm, Map params, String separator,
+ String keyValueSeparator, boolean isIgnoreNull, String... otherParams) {
+ return new Digester(digestAlgorithm).digestHex(MapUtil.sortJoin(params, separator, keyValueSeparator, isIgnoreNull, otherParams));
+ }
+}
diff --git a/hutool-db/pom.xml b/hutool-db/pom.xml
index 7b35e41ad..92fe54fa8 100644
--- a/hutool-db/pom.xml
+++ b/hutool-db/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.7.19
+ 5.7.20-SNAPSHOT
hutool-db
diff --git a/hutool-dfa/pom.xml b/hutool-dfa/pom.xml
index 37bd3ae42..183c0eff9 100644
--- a/hutool-dfa/pom.xml
+++ b/hutool-dfa/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.7.19
+ 5.7.20-SNAPSHOT
hutool-dfa
diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml
index 2fd49d272..7fca763ac 100644
--- a/hutool-extra/pom.xml
+++ b/hutool-extra/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.7.19
+ 5.7.20-SNAPSHOT
hutool-extra
diff --git a/hutool-http/pom.xml b/hutool-http/pom.xml
index de2525d33..a27a4ac72 100644
--- a/hutool-http/pom.xml
+++ b/hutool-http/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.7.19
+ 5.7.20-SNAPSHOT
hutool-http
diff --git a/hutool-http/src/main/java/cn/hutool/http/useragent/OS.java b/hutool-http/src/main/java/cn/hutool/http/useragent/OS.java
index 2e6bb9f0f..dc86b87e7 100644
--- a/hutool-http/src/main/java/cn/hutool/http/useragent/OS.java
+++ b/hutool-http/src/main/java/cn/hutool/http/useragent/OS.java
@@ -25,8 +25,8 @@ public class OS extends UserAgentInfo {
*/
public static final List oses = CollUtil.newArrayList(//
new OS("Windows 10 or Windows Server 2016", "windows nt 10\\.0", "windows nt (10\\.0)"),//
- new OS("Windows 8.1 or Winsows Server 2012R2", "windows nt 6\\.3", "windows nt (6\\.3)"),//
- new OS("Windows 8 or Winsows Server 2012", "windows nt 6\\.2", "windows nt (6\\.2)"),//
+ new OS("Windows 8.1 or Windows Server 2012R2", "windows nt 6\\.3", "windows nt (6\\.3)"),//
+ new OS("Windows 8 or Windows Server 2012", "windows nt 6\\.2", "windows nt (6\\.2)"),//
new OS("Windows Vista", "windows nt 6\\.0", "windows nt (6\\.0)"), //
new OS("Windows 7 or Windows Server 2008R2", "windows nt 6\\.1", "windows nt (6\\.1)"), //
new OS("Windows 2003", "windows nt 5\\.2", "windows nt (5\\.2)"), //
diff --git a/hutool-http/src/test/java/cn/hutool/http/useragent/UserAgentUtilTest.java b/hutool-http/src/test/java/cn/hutool/http/useragent/UserAgentUtilTest.java
index 49cc4fe02..499cf781d 100644
--- a/hutool-http/src/test/java/cn/hutool/http/useragent/UserAgentUtilTest.java
+++ b/hutool-http/src/test/java/cn/hutool/http/useragent/UserAgentUtilTest.java
@@ -169,7 +169,7 @@ public class UserAgentUtilTest {
Assert.assertEquals("63.0.3239.132", ua.getVersion());
Assert.assertEquals("Webkit", ua.getEngine().toString());
Assert.assertEquals("537.36", ua.getEngineVersion());
- Assert.assertEquals("Windows 8.1 or Winsows Server 2012R2", ua.getOs().toString());
+ Assert.assertEquals("Windows 8.1 or Windows Server 2012R2", ua.getOs().toString());
Assert.assertEquals("6.3", ua.getOsVersion());
Assert.assertEquals("Windows", ua.getPlatform().toString());
Assert.assertFalse(ua.isMobile());
diff --git a/hutool-json/pom.xml b/hutool-json/pom.xml
index ef9c36c8a..5103dc136 100644
--- a/hutool-json/pom.xml
+++ b/hutool-json/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.7.19
+ 5.7.20-SNAPSHOT
hutool-json
diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONArray.java b/hutool-json/src/main/java/cn/hutool/json/JSONArray.java
index df5f34f13..c1d9e2492 100644
--- a/hutool-json/src/main/java/cn/hutool/json/JSONArray.java
+++ b/hutool-json/src/main/java/cn/hutool/json/JSONArray.java
@@ -95,7 +95,7 @@ public class JSONArray implements JSON, JSONGetter, List