mirror of
https://gitee.com/dromara/hutool.git
synced 2025-04-05 17:20:07 +08:00
Prepare release
This commit is contained in:
Looly
commit
21d3dadd13
16
CHANGELOG.md
16
CHANGELOG.md
@ -1,6 +1,22 @@
|
||||
|
||||
# 🚀Changelog
|
||||
|
||||
-------------------------------------------------------------------------------------------------------------
|
||||
# 5.8.36(2025-02-18)
|
||||
|
||||
### 🐣新特性
|
||||
* 【crypto 】 增加BCUtil.decodeECPrivateKey方法（issue#3829@Github）
|
||||
* 【core 】 增加HtmlUtil.cleanEmptyTag方法（pr#3838@Github）
|
||||
* 【db 】 GlobalDbSetting优化默认配置读取规则，优先读取文件而非jar中的文件（issue#900@Github）
|
||||
* 【dfa 】 删除StopChar类中存在重复字符（pr#3841@Github）
|
||||
* 【http 】 支持鸿蒙设备 UA 解析（pr#1301@Gitee）
|
||||
|
||||
### 🐞Bug修复
|
||||
* 【aop 】 修复ProxyUtil可能的空指针问题（issue#IBF20Z@Gitee）
|
||||
* 【core 】 修复XmlUtil转义调用方法错误问题，修复XmlEscape未转义单引号问题（pr#3837@Github）
|
||||
* 【core 】 修复FileUtil.isAbsolutePath没有判断smb路径问题（pr#1299@Gitee）
|
||||
* 【core 】 修复AbstractFilter没有检查参数长度问题（issue#3854@Github）
|
||||
|
||||
-------------------------------------------------------------------------------------------------------------
|
||||
# 5.8.35(2024-12-25)
|
||||
|
||||
|
||||
@ -153,18 +153,18 @@ We provide the T-Shirt and Sweater with Hutool Logo, please visit the shop：
|
||||
<dependency>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-all</artifactId>
|
||||
<version>5.8.35</version>
|
||||
<version>5.8.36</version>
|
||||
</dependency>
|
||||
```
|
||||
|
||||
### 🍐Gradle
|
||||
```
|
||||
implementation 'cn.hutool:hutool-all:5.8.35'
|
||||
implementation 'cn.hutool:hutool-all:5.8.36'
|
||||
```
|
||||
|
||||
## 📥Download
|
||||
|
||||
- [Maven Repo](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.8.35/)
|
||||
- [Maven Repo](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.8.36/)
|
||||
|
||||
> 🔔️note:
|
||||
> Hutool 5.x supports JDK8+ and is not tested on Android platforms, and cannot guarantee that all tool classes or tool methods are available.
|
||||
|
||||
@ -146,20 +146,20 @@ Hutool = Hu + tool，是原公司项目底层代码剥离后的开源库，“Hu
|
||||
<dependency>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-all</artifactId>
|
||||
<version>5.8.35</version>
|
||||
<version>5.8.36</version>
|
||||
</dependency>
|
||||
```
|
||||
|
||||
### 🍐Gradle
|
||||
```
|
||||
implementation 'cn.hutool:hutool-all:5.8.35'
|
||||
implementation 'cn.hutool:hutool-all:5.8.36'
|
||||
```
|
||||
|
||||
### 📥下载jar
|
||||
|
||||
点击以下链接，下载`hutool-all-X.X.X.jar`即可：
|
||||
|
||||
- [Maven中央库](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.8.35/)
|
||||
- [Maven中央库](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.8.36/)
|
||||
|
||||
> 🔔️注意
|
||||
> Hutool 5.x支持JDK8+，对Android平台没有测试，不能保证所有工具类或工具方法可用。
|
||||
|
||||
@ -4,3 +4,8 @@
|
||||
|
||||
# 多模块聚合文档，生成在target/site/apidocs
|
||||
exec mvn javadoc:aggregate
|
||||
|
||||
bin_home="$(dirname ${BASH_SOURCE[0]})"
|
||||
|
||||
# 拷贝自定义的index.html到聚合文档目录
|
||||
cp -vf $bin_home/../docs/apidocs/index.html $bin_home/../target/reports/apidocs/
|
||||
|
||||
@ -1 +1 @@
|
||||
5.8.35
|
||||
5.8.36
|
||||
|
||||
@ -1 +1 @@
|
||||
var version = '5.8.35'
|
||||
var version = '5.8.36'
|
||||
@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-parent</artifactId>
|
||||
<version>5.8.35</version>
|
||||
<version>5.8.36</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>hutool-all</artifactId>
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-parent</artifactId>
|
||||
<version>5.8.35</version>
|
||||
<version>5.8.36</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>hutool-aop</artifactId>
|
||||
|
||||
@ -12,6 +12,11 @@ import cn.hutool.aop.interceptor.JdkInterceptor;
|
||||
public class JdkProxyFactory extends ProxyFactory {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 获取单例
|
||||
*/
|
||||
public static JdkProxyFactory INSTANCE = new JdkProxyFactory();
|
||||
|
||||
@Override
|
||||
public <T> T proxy(T target, Aspect aspect) {
|
||||
return ProxyUtil.newProxyInstance(//
|
||||
|
||||
@ -59,7 +59,13 @@ public abstract class ProxyFactory implements Serializable {
|
||||
* @return 代理对象
|
||||
*/
|
||||
public static <T> T createProxy(T target, Aspect aspect) {
|
||||
return create().proxy(target, aspect);
|
||||
ProxyFactory factory = create();
|
||||
if(null == factory){
|
||||
// issue#IBF20Z
|
||||
// 可能的空指针问题
|
||||
factory = JdkProxyFactory.INSTANCE;
|
||||
}
|
||||
return factory.proxy(target, aspect);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -0,0 +1,49 @@
|
||||
package cn.hutool.aop.test;
|
||||
|
||||
import cn.hutool.aop.proxy.ProxyFactory;
|
||||
import cn.hutool.core.lang.Console;
|
||||
import cn.hutool.core.thread.ThreadUtil;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.util.concurrent.CountDownLatch;
|
||||
import java.util.concurrent.ExecutorService;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
|
||||
public class IssueIBF20ZTest {
|
||||
|
||||
@Test
|
||||
public void testLoadFirstAvailableConcurrent() throws InterruptedException {
|
||||
// 创建一个固定大小的线程池
|
||||
int threadCount = 1000;
|
||||
ExecutorService executorService = ThreadUtil.newExecutor(threadCount);
|
||||
|
||||
// 创建一个 CountDownLatch，用于等待所有任务完成
|
||||
CountDownLatch latch = new CountDownLatch(threadCount);
|
||||
|
||||
// 计数器用于统计成功加载服务提供者的次数
|
||||
AtomicInteger successCount = new AtomicInteger(0);
|
||||
|
||||
// 提交多个任务到线程池
|
||||
for (int i = 0; i < threadCount; i++) {
|
||||
executorService.submit(() -> {
|
||||
ProxyFactory factory = ProxyFactory.create();
|
||||
if (factory != null) {
|
||||
Console.log(factory.getClass());
|
||||
successCount.incrementAndGet();
|
||||
}
|
||||
latch.countDown(); // 每个任务完成时，计数减一
|
||||
});
|
||||
}
|
||||
|
||||
// 等待所有任务完成
|
||||
latch.await();
|
||||
|
||||
// 关闭线程池并等待所有任务完成
|
||||
executorService.shutdown();
|
||||
|
||||
// 验证所有线程都成功加载了服务提供者
|
||||
assertEquals(threadCount, successCount.get());
|
||||
}
|
||||
}
|
||||
@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-parent</artifactId>
|
||||
<version>5.8.35</version>
|
||||
<version>5.8.36</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>hutool-bloomFilter</artifactId>
|
||||
|
||||
@ -4,6 +4,7 @@ import cn.hutool.bloomfilter.BloomFilter;
|
||||
import cn.hutool.bloomfilter.bitMap.BitMap;
|
||||
import cn.hutool.bloomfilter.bitMap.IntMap;
|
||||
import cn.hutool.bloomfilter.bitMap.LongMap;
|
||||
import cn.hutool.core.lang.Assert;
|
||||
|
||||
/**
|
||||
* 抽象Bloom过滤器
|
||||
@ -46,7 +47,7 @@ public abstract class AbstractFilter implements BloomFilter {
|
||||
* @param machineNum 机器位数
|
||||
*/
|
||||
public void init(long maxValue, int machineNum) {
|
||||
this.size = maxValue;
|
||||
this.size = Assert.checkBetween(maxValue, 1, Integer.MAX_VALUE);
|
||||
switch (machineNum) {
|
||||
case BitMap.MACHINE32:
|
||||
bm = new IntMap((int) (size / machineNum));
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-parent</artifactId>
|
||||
<version>5.8.35</version>
|
||||
<version>5.8.36</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>hutool-bom</artifactId>
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-parent</artifactId>
|
||||
<version>5.8.35</version>
|
||||
<version>5.8.36</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>hutool-cache</artifactId>
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-parent</artifactId>
|
||||
<version>5.8.35</version>
|
||||
<version>5.8.36</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>hutool-captcha</artifactId>
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-parent</artifactId>
|
||||
<version>5.8.35</version>
|
||||
<version>5.8.36</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>hutool-core</artifactId>
|
||||
|
||||
@ -64,6 +64,10 @@ public class FileUtil extends PathUtil {
|
||||
*/
|
||||
private static final Pattern PATTERN_PATH_ABSOLUTE = Pattern.compile("^[a-zA-Z]:([/\\\\].*)?", Pattern.DOTALL);
|
||||
|
||||
/**
|
||||
* windows的共享文件夹开头
|
||||
*/
|
||||
private static final String SMB_PATH_PREFIX = "\\\\";
|
||||
|
||||
/**
|
||||
* 是否为Windows环境
|
||||
@ -1370,6 +1374,7 @@ public class FileUtil extends PathUtil {
|
||||
* <li>以/开头的路径</li>
|
||||
* <li>满足类似于 c:/xxxxx，其中祖母随意，不区分大小写</li>
|
||||
* <li>满足类似于 d:\xxxxx，其中祖母随意，不区分大小写</li>
|
||||
* <li>满足windows SMB协议格式，如: \\192.168.254.1\Share</li>
|
||||
* </ul>
|
||||
*
|
||||
* @param path 需要检查的Path
|
||||
@ -1381,7 +1386,7 @@ public class FileUtil extends PathUtil {
|
||||
}
|
||||
|
||||
// 给定的路径已经是绝对路径了
|
||||
return StrUtil.C_SLASH == path.charAt(0) || ReUtil.isMatch(PATTERN_PATH_ABSOLUTE, path);
|
||||
return StrUtil.C_SLASH == path.charAt(0) || path.startsWith(SMB_PATH_PREFIX) || ReUtil.isMatch(PATTERN_PATH_ABSOLUTE, path);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -1667,7 +1672,7 @@ public class FileUtil extends PathUtil {
|
||||
}
|
||||
|
||||
//兼容Windows下的共享目录路径（原始路径如果以\\开头，则保留这种路径）
|
||||
if (path.startsWith("\\\\")) {
|
||||
if (path.startsWith(SMB_PATH_PREFIX)) {
|
||||
return path;
|
||||
}
|
||||
|
||||
|
||||
@ -79,6 +79,9 @@ public class FileResource implements Resource, Serializable {
|
||||
|
||||
@Override
|
||||
public InputStream getStream() throws NoResourceException {
|
||||
if (!this.file.exists()) {
|
||||
throw new NoResourceException("File [{}] not exist!", this.file.getAbsolutePath());
|
||||
}
|
||||
return FileUtil.getInputStream(this.file);
|
||||
}
|
||||
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
package cn.hutool.core.text.escape;
|
||||
|
||||
import cn.hutool.core.text.replacer.LookupReplacer;
|
||||
import cn.hutool.core.text.replacer.ReplacerChain;
|
||||
|
||||
/**
|
||||
* HTML4的ESCAPE
|
||||
@ -9,9 +10,21 @@ import cn.hutool.core.text.replacer.LookupReplacer;
|
||||
* @author looly
|
||||
*
|
||||
*/
|
||||
public class Html4Escape extends XmlEscape {
|
||||
public class Html4Escape extends ReplacerChain {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* HTML转义字符<br>
|
||||
* HTML转义相比XML，并不转义单引号<br>
|
||||
* 见：https://stackoverflow.com/questions/1091945/what-characters-do-i-need-to-escape-in-xml-documents
|
||||
*/
|
||||
protected static final String[][] BASIC_ESCAPE = { //
|
||||
{"\"", """}, // " - double-quote
|
||||
{"&", "&"}, // & - ampersand
|
||||
{"<", "<"}, // < - less-than
|
||||
{">", ">"}, // > - greater-than
|
||||
};
|
||||
|
||||
protected static final String[][] ISO8859_1_ESCAPE = { //
|
||||
{ "\u00A0", " " }, // non-breaking space
|
||||
{ "\u00A1", "¡" }, // inverted exclamation mark
|
||||
@ -310,6 +323,7 @@ public class Html4Escape extends XmlEscape {
|
||||
|
||||
public Html4Escape() {
|
||||
super();
|
||||
addChain(new LookupReplacer(BASIC_ESCAPE));
|
||||
addChain(new LookupReplacer(ISO8859_1_ESCAPE));
|
||||
addChain(new LookupReplacer(HTML40_EXTENDED_ESCAPE));
|
||||
}
|
||||
|
||||
@ -22,7 +22,7 @@ public class XmlEscape extends ReplacerChain {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
protected static final String[][] BASIC_ESCAPE = { //
|
||||
// {"'", "'"}, // " - single-quote
|
||||
{"'", "'"}, // " - single-quote
|
||||
{"\"", """}, // " - double-quote
|
||||
{"&", "&"}, // & - ampersand
|
||||
{"<", "<"}, // < - less-than
|
||||
|
||||
@ -13,8 +13,6 @@ public class XmlUnescape extends ReplacerChain {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
protected static final String[][] BASIC_UNESCAPE = InternalEscapeUtil.invert(XmlEscape.BASIC_ESCAPE);
|
||||
// issue#1118
|
||||
protected static final String[][] OTHER_UNESCAPE = new String[][]{new String[]{"'", "'"}};
|
||||
|
||||
/**
|
||||
* 构造
|
||||
@ -22,6 +20,5 @@ public class XmlUnescape extends ReplacerChain {
|
||||
public XmlUnescape() {
|
||||
addChain(new LookupReplacer(BASIC_UNESCAPE));
|
||||
addChain(new NumericEntityUnescaper());
|
||||
addChain(new LookupReplacer(OTHER_UNESCAPE));
|
||||
}
|
||||
}
|
||||
|
||||
@ -956,6 +956,7 @@ public class XmlUtil {
|
||||
* < (小于) 替换为 &lt;
|
||||
* > (大于) 替换为 &gt;
|
||||
* " (双引号) 替换为 &quot;
|
||||
* ' (单引号) 替换为 &apos;
|
||||
* </pre>
|
||||
*
|
||||
* @param string 被替换的字符串
|
||||
@ -963,7 +964,7 @@ public class XmlUtil {
|
||||
* @since 4.0.8
|
||||
*/
|
||||
public static String escape(String string) {
|
||||
return EscapeUtil.escapeHtml4(string);
|
||||
return EscapeUtil.escapeXml(string);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -975,7 +976,7 @@ public class XmlUtil {
|
||||
* @since 5.0.6
|
||||
*/
|
||||
public static String unescape(String string) {
|
||||
return EscapeUtil.unescapeHtml4(string);
|
||||
return EscapeUtil.unescapeXml(string);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -0,0 +1,61 @@
|
||||
package cn.hutool.core.bean;
|
||||
|
||||
import cn.hutool.core.bean.copier.CopyOptions;
|
||||
import cn.hutool.core.convert.TypeConverter;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.util.ReflectUtil;
|
||||
import lombok.Data;
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 自定义某个字段的转换
|
||||
*/
|
||||
public class IssueIBLTZWTest {
|
||||
@Test
|
||||
public void copyTest() {
|
||||
TestBean bean = new TestBean();
|
||||
bean.setName("test");
|
||||
bean.setDate(DateUtil.parse("2025-02-17"));
|
||||
|
||||
final TestBean2 testBean2 = new TestBean2();
|
||||
BeanUtil.copyProperties(bean, testBean2, createCopyOptions(TestBean2.class));
|
||||
Assertions.assertEquals("2025", testBean2.getDate());
|
||||
}
|
||||
|
||||
@Data
|
||||
static class TestBean {
|
||||
private String name;
|
||||
private Date date;
|
||||
}
|
||||
|
||||
@Data
|
||||
static class TestBean2 {
|
||||
private String name;
|
||||
private String date;
|
||||
}
|
||||
|
||||
static CopyOptions createCopyOptions(Class<?> targetClass) {
|
||||
CopyOptions copyOptions = CopyOptions.create();
|
||||
TypeConverter converter = (TypeConverter) ReflectUtil.getFieldValue(copyOptions, "converter");
|
||||
copyOptions
|
||||
.setIgnoreError(true) // 忽略类型错误，避免自动转换
|
||||
.setConverter(null)
|
||||
.setFieldValueEditor((fieldName, value) -> {
|
||||
try {
|
||||
Field targetField = targetClass.getDeclaredField(fieldName);
|
||||
// Date类型的 value instanceof 结果是String
|
||||
if (targetField.getType() == String.class && value instanceof Date) {
|
||||
return DateUtil.format((Date)value, "yyyy");
|
||||
}
|
||||
return converter.convert(targetField.getType(), value);
|
||||
} catch (NoSuchFieldException e) {
|
||||
return value;
|
||||
}
|
||||
});
|
||||
return copyOptions;
|
||||
}
|
||||
}
|
||||
@ -53,6 +53,16 @@ public class FileUtilTest {
|
||||
|
||||
path = FileUtil.getAbsolutePath("d:");
|
||||
assertEquals("d:", path);
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
public void smbPathTest() {
|
||||
final String smbPath = "\\\\192.168.1.1\\share\\rc-source";
|
||||
final String parseSmbPath = FileUtil.getAbsolutePath(smbPath);
|
||||
assertEquals(smbPath, parseSmbPath);
|
||||
assertTrue(FileUtil.isAbsolutePath(smbPath));
|
||||
assertTrue(Paths.get(smbPath).isAbsolute());
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@ -0,0 +1,23 @@
|
||||
package cn.hutool.core.io;
|
||||
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.date.StopWatch;
|
||||
import cn.hutool.core.io.resource.ResourceUtil;
|
||||
import cn.hutool.core.lang.Console;
|
||||
import org.junit.jupiter.api.Disabled;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
public class Issue3846Test {
|
||||
@Test
|
||||
@Disabled
|
||||
void readBytesTest() {
|
||||
final StopWatch stopWatch = DateUtil.createStopWatch();
|
||||
stopWatch.start();
|
||||
final String filePath = "d:/test/issue3846.data";
|
||||
final byte[] bytes = IoUtil.readBytes(ResourceUtil.getStream(filePath), false);
|
||||
stopWatch.stop();
|
||||
Console.log(stopWatch.prettyPrint(TimeUnit.MILLISECONDS));
|
||||
}
|
||||
}
|
||||
@ -3,12 +3,15 @@ package cn.hutool.core.map;
|
||||
import cn.hutool.core.convert.Convert;
|
||||
import cn.hutool.core.lang.Dict;
|
||||
import cn.hutool.core.lang.Opt;
|
||||
import cn.hutool.core.lang.TypeReference;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
import java.util.function.Function;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
@ -61,10 +64,10 @@ public class MapUtilTest {
|
||||
public void mapTest() {
|
||||
// Add test like a foreigner
|
||||
final Map<Integer, String> adjectivesMap = MapUtil.<Integer, String>builder()
|
||||
.put(0, "lovely")
|
||||
.put(1, "friendly")
|
||||
.put(2, "happily")
|
||||
.build();
|
||||
.put(0, "lovely")
|
||||
.put(1, "friendly")
|
||||
.put(2, "happily")
|
||||
.build();
|
||||
|
||||
final Map<Integer, String> resultMap = MapUtil.map(adjectivesMap, (k, v) -> v + " " + PeopleEnum.values()[k].name().toLowerCase());
|
||||
|
||||
@ -80,7 +83,7 @@ public class MapUtilTest {
|
||||
final Map<Long, User> idUserMap = Stream.iterate(0L, i -> ++i).limit(4).map(i -> User.builder().id(i).name(customers.poll()).build()).collect(Collectors.toMap(User::getId, Function.identity()));
|
||||
// 如你所见，它是一个map，key由分组id，value由用户ids组成，典型的多对多关系
|
||||
final Map<Long, List<Long>> groupIdUserIdsMap = groups.stream().flatMap(group -> idUserMap.keySet().stream().map(userId -> UserGroup.builder().groupId(group.getId()).userId(userId).build()))
|
||||
.collect(Collectors.groupingBy(UserGroup::getGroupId, Collectors.mapping(UserGroup::getUserId, Collectors.toList())));
|
||||
.collect(Collectors.groupingBy(UserGroup::getGroupId, Collectors.mapping(UserGroup::getUserId, Collectors.toList())));
|
||||
|
||||
// 神奇的魔法发生了， 分组id和用户ids组成的map，竟然变成了订单编号和用户实体集合组成的map
|
||||
final Map<Long, List<User>> groupIdUserMap = MapUtil.map(groupIdUserIdsMap, (groupId, userIds) -> userIds.stream().map(idUserMap::get).collect(Collectors.toList()));
|
||||
@ -190,11 +193,11 @@ public class MapUtilTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void sortJoinTest(){
|
||||
public void sortJoinTest() {
|
||||
final Map<String, String> build = MapUtil.builder(new HashMap<String, String>())
|
||||
.put("key1", "value1")
|
||||
.put("key3", "value3")
|
||||
.put("key2", "value2").build();
|
||||
.put("key1", "value1")
|
||||
.put("key3", "value3")
|
||||
.put("key2", "value2").build();
|
||||
|
||||
final String join1 = MapUtil.sortJoin(build, StrUtil.EMPTY, StrUtil.EMPTY, false);
|
||||
assertEquals("key1value1key2value2key3value3", join1);
|
||||
@ -207,7 +210,7 @@ public class MapUtilTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void ofEntriesTest(){
|
||||
public void ofEntriesTest() {
|
||||
final Map<String, Integer> map = MapUtil.ofEntries(MapUtil.entry("a", 1), MapUtil.entry("b", 2));
|
||||
assertEquals(2, map.size());
|
||||
|
||||
@ -216,7 +219,19 @@ public class MapUtilTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getIntTest(){
|
||||
public void ofEntriesSimpleEntryTest() {
|
||||
final Map<String, Integer> map = MapUtil.ofEntries(
|
||||
MapUtil.entry("a", 1, false),
|
||||
MapUtil.entry("b", 2, false)
|
||||
);
|
||||
assertEquals(2, map.size());
|
||||
|
||||
assertEquals(Integer.valueOf(1), map.get("a"));
|
||||
assertEquals(Integer.valueOf(2), map.get("b"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getIntTest() {
|
||||
assertThrows(NumberFormatException.class, () -> {
|
||||
final HashMap<String, String> map = MapUtil.of("age", "d");
|
||||
final Integer age = MapUtil.getInt(map, "age");
|
||||
@ -238,18 +253,613 @@ public class MapUtilTest {
|
||||
assertEquals("张三", map.get("newName"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void renameKeyMapEmptyNoChange() {
|
||||
Map<String, String> map = new HashMap<>();
|
||||
Map<String, String> result = MapUtil.renameKey(map, "oldKey", "newKey");
|
||||
assertTrue(result.isEmpty());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void renameKeyOldKeyNotPresentNoChange() {
|
||||
Map<String, String> map = new HashMap<>();
|
||||
map.put("anotherKey", "value");
|
||||
Map<String, String> result = MapUtil.renameKey(map, "oldKey", "newKey");
|
||||
assertEquals(1, result.size());
|
||||
assertEquals("value", result.get("anotherKey"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void renameKeyOldKeyPresentNewKeyNotPresentKeyRenamed() {
|
||||
Map<String, String> map = new HashMap<>();
|
||||
map.put("oldKey", "value");
|
||||
Map<String, String> result = MapUtil.renameKey(map, "oldKey", "newKey");
|
||||
assertEquals(1, result.size());
|
||||
assertEquals("value", result.get("newKey"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void renameKeyNewKeyPresentThrowsException() {
|
||||
Map<String, String> map = new HashMap<>();
|
||||
map.put("oldKey", "value");
|
||||
map.put("newKey", "existingValue");
|
||||
assertThrows(IllegalArgumentException.class, () -> {
|
||||
MapUtil.renameKey(map, "oldKey", "newKey");
|
||||
});
|
||||
}
|
||||
|
||||
@Test
|
||||
public void issue3162Test() {
|
||||
final Map<String, Object> map = new HashMap<String, Object>() {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
{
|
||||
put("a", "1");
|
||||
put("b", "2");
|
||||
put("c", "3");
|
||||
}};
|
||||
put("a", "1");
|
||||
put("b", "2");
|
||||
put("c", "3");
|
||||
}
|
||||
};
|
||||
final Map<String, Object> filtered = MapUtil.filter(map, "a", "b");
|
||||
assertEquals(2, filtered.size());
|
||||
assertEquals("1", filtered.get("a"));
|
||||
assertEquals("2", filtered.get("b"));
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void partitionNullMapThrowsException() {
|
||||
assertThrows(IllegalArgumentException.class, () -> MapUtil.partition(null, 2));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void partitionSizeZeroThrowsException() {
|
||||
Map<String, String> map = new HashMap<>();
|
||||
map.put("a", "1");
|
||||
assertThrows(IllegalArgumentException.class, () -> MapUtil.partition(map, 0));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void partitionSizeNegativeThrowsException() {
|
||||
Map<String, String> map = new HashMap<>();
|
||||
map.put("a", "1");
|
||||
assertThrows(IllegalArgumentException.class, () -> MapUtil.partition(map, -1));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void partitionEmptyMapReturnsEmptyList() {
|
||||
Map<String, String> map = new HashMap<>();
|
||||
List<Map<String, String>> result = MapUtil.partition(map, 2);
|
||||
assertTrue(result.isEmpty());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void partitionMapSizeMultipleOfSizePartitionsCorrectly() {
|
||||
Map<String, String> map = new HashMap<>();
|
||||
map.put("a", "1");
|
||||
map.put("b", "2");
|
||||
map.put("c", "3");
|
||||
map.put("d", "4");
|
||||
|
||||
List<Map<String, String>> result = MapUtil.partition(map, 2);
|
||||
|
||||
assertEquals(2, result.size());
|
||||
assertEquals(2, result.get(0).size());
|
||||
assertEquals(2, result.get(1).size());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void partitionMapSizeNotMultipleOfSizePartitionsCorrectly() {
|
||||
Map<String, String> map = new HashMap<>();
|
||||
map.put("a", "1");
|
||||
map.put("b", "2");
|
||||
map.put("c", "3");
|
||||
map.put("d", "4");
|
||||
map.put("e", "5");
|
||||
|
||||
List<Map<String, String>> result = MapUtil.partition(map, 2);
|
||||
|
||||
assertEquals(3, result.size());
|
||||
assertEquals(2, result.get(0).size());
|
||||
assertEquals(2, result.get(1).size());
|
||||
assertEquals(1, result.get(2).size());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void partitionGeneralCasePartitionsCorrectly() {
|
||||
Map<String, String> map = new HashMap<>();
|
||||
map.put("a", "1");
|
||||
map.put("b", "2");
|
||||
map.put("c", "3");
|
||||
map.put("d", "4");
|
||||
map.put("e", "5");
|
||||
map.put("f", "6");
|
||||
|
||||
List<Map<String, String>> result = MapUtil.partition(map, 3);
|
||||
|
||||
assertEquals(2, result.size());
|
||||
assertEquals(3, result.get(0).size());
|
||||
assertEquals(3, result.get(1).size());
|
||||
}
|
||||
|
||||
|
||||
// ---------MapUtil.computeIfAbsentForJdk8
|
||||
@Test
|
||||
public void computeIfAbsentForJdk8KeyExistsReturnsExistingValue() {
|
||||
Map<String, Integer> map = new HashMap<>();
|
||||
map.put("key", 10);
|
||||
Integer result = MapUtil.computeIfAbsentForJdk8(map, "key", k -> 20);
|
||||
assertEquals(10, result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void computeIfAbsentForJdk8KeyDoesNotExistComputesAndInsertsValue() {
|
||||
Map<String, Integer> map = new HashMap<>();
|
||||
Integer result = MapUtil.computeIfAbsentForJdk8(map, "key", k -> 20);
|
||||
assertEquals(20, result);
|
||||
assertEquals(20, map.get("key"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void computeIfAbsentForJdk8ConcurrentInsertReturnsOldValue() {
|
||||
ConcurrentHashMap<String, Integer> concurrentMap = new ConcurrentHashMap<>();
|
||||
concurrentMap.put("key", 30);
|
||||
AtomicInteger counter = new AtomicInteger(0);
|
||||
|
||||
// 模拟并发插入
|
||||
concurrentMap.computeIfAbsent("key", k -> {
|
||||
counter.incrementAndGet();
|
||||
return 40;
|
||||
});
|
||||
|
||||
Integer result = MapUtil.computeIfAbsentForJdk8(concurrentMap, "key", k -> 50);
|
||||
assertEquals(30, result);
|
||||
assertEquals(30, concurrentMap.get("key"));
|
||||
assertEquals(0, counter.get());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void computeIfAbsentForJdk8NullValueComputesAndInsertsValue() {
|
||||
Map<String, Integer> map = new HashMap<>();
|
||||
map.put("key", null);
|
||||
Integer result = MapUtil.computeIfAbsentForJdk8(map, "key", k -> 20);
|
||||
assertEquals(20, result);
|
||||
assertEquals(20, map.get("key"));
|
||||
}
|
||||
|
||||
//--------MapUtil.computeIfAbsent
|
||||
@Test
|
||||
public void computeIfAbsentKeyExistsReturnsExistingValue() {
|
||||
Map<String, Integer> map = new HashMap<>();
|
||||
map.put("key", 10);
|
||||
Integer result = MapUtil.computeIfAbsent(map, "key", k -> 20);
|
||||
assertEquals(10, result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void computeIfAbsentKeyDoesNotExistComputesAndInsertsValue() {
|
||||
Map<String, Integer> map = new HashMap<>();
|
||||
Integer result = MapUtil.computeIfAbsent(map, "key", k -> 20);
|
||||
assertEquals(20, result);
|
||||
assertEquals(20, map.get("key"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void computeIfAbsentConcurrentInsertReturnsOldValue() {
|
||||
ConcurrentHashMap<String, Integer> concurrentMap = new ConcurrentHashMap<>();
|
||||
concurrentMap.put("key", 30);
|
||||
AtomicInteger counter = new AtomicInteger(0);
|
||||
|
||||
// 模拟并发插入
|
||||
concurrentMap.computeIfAbsent("key", k -> {
|
||||
counter.incrementAndGet();
|
||||
return 40;
|
||||
});
|
||||
|
||||
Integer result = MapUtil.computeIfAbsent(concurrentMap, "key", k -> 50);
|
||||
assertEquals(30, result);
|
||||
assertEquals(30, concurrentMap.get("key"));
|
||||
assertEquals(0, counter.get());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void computeIfAbsentNullValueComputesAndInsertsValue() {
|
||||
Map<String, Integer> map = new HashMap<>();
|
||||
map.put("key", null);
|
||||
Integer result = MapUtil.computeIfAbsent(map, "key", k -> 20);
|
||||
assertEquals(20, result);
|
||||
assertEquals(20, map.get("key"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void computeIfAbsentEmptyMapInsertsValue() {
|
||||
Map<String, Integer> map = new HashMap<>();
|
||||
Integer result = MapUtil.computeIfAbsent(map, "newKey", k -> 100);
|
||||
assertEquals(100, result);
|
||||
assertEquals(100, map.get("newKey"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void computeIfAbsentJdk8KeyExistsReturnsExistingValue() {
|
||||
Map<String, Integer> map = new HashMap<>();
|
||||
// 假设JdkUtil.ISJDK8为true
|
||||
map.put("key", 10);
|
||||
Integer result = MapUtil.computeIfAbsent(map, "key", k -> 20);
|
||||
assertEquals(10, result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void computeIfAbsentJdk8KeyDoesNotExistComputesAndInsertsValue() {
|
||||
Map<String, Integer> map = new HashMap<>();
|
||||
// 假设JdkUtil.ISJDK8为true
|
||||
Integer result = MapUtil.computeIfAbsent(map, "key", k -> 20);
|
||||
assertEquals(20, result);
|
||||
assertEquals(20, map.get("key"));
|
||||
}
|
||||
|
||||
|
||||
//----------valuesOfKeys
|
||||
@Test
|
||||
public void valuesOfKeysEmptyIteratorReturnsEmptyList() {
|
||||
Map<String, String> map = new HashMap<>();
|
||||
map.put("a", "1");
|
||||
map.put("b", "2");
|
||||
map.put("c", "3");
|
||||
Iterator<String> emptyIterator = Collections.emptyIterator();
|
||||
ArrayList<String> result = MapUtil.valuesOfKeys(map, emptyIterator);
|
||||
assertEquals(new ArrayList<String>(), result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void valuesOfKeysNonEmptyIteratorReturnsValuesList() {
|
||||
Map<String, String> map = new HashMap<>();
|
||||
map.put("a", "1");
|
||||
map.put("b", "2");
|
||||
map.put("c", "3");
|
||||
Iterator<String> iterator = new ArrayList<String>() {
|
||||
private static final long serialVersionUID = -4593258366224032110L;
|
||||
|
||||
{
|
||||
add("a");
|
||||
add("b");
|
||||
}
|
||||
}.iterator();
|
||||
ArrayList<String> result = MapUtil.valuesOfKeys(map, iterator);
|
||||
assertEquals(new ArrayList<String>() {
|
||||
private static final long serialVersionUID = 7218152799308667271L;
|
||||
|
||||
{
|
||||
add("1");
|
||||
add("2");
|
||||
}
|
||||
}, result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void valuesOfKeysKeysNotInMapReturnsNulls() {
|
||||
Map<String, String> map = new HashMap<>();
|
||||
map.put("a", "1");
|
||||
map.put("b", "2");
|
||||
map.put("c", "3");
|
||||
Iterator<String> iterator = new ArrayList<String>() {
|
||||
private static final long serialVersionUID = -5479427021989481058L;
|
||||
|
||||
{
|
||||
add("d");
|
||||
add("e");
|
||||
}
|
||||
}.iterator();
|
||||
ArrayList<String> result = MapUtil.valuesOfKeys(map, iterator);
|
||||
assertEquals(new ArrayList<String>() {
|
||||
private static final long serialVersionUID = 4390715387901549136L;
|
||||
|
||||
{
|
||||
add(null);
|
||||
add(null);
|
||||
}
|
||||
}, result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void valuesOfKeysMixedKeysReturnsMixedValues() {
|
||||
Map<String, String> map = new HashMap<>();
|
||||
map.put("a", "1");
|
||||
map.put("b", "2");
|
||||
map.put("c", "3");
|
||||
Iterator<String> iterator = new ArrayList<String>() {
|
||||
private static final long serialVersionUID = 8510595063492828968L;
|
||||
|
||||
{
|
||||
add("a");
|
||||
add("d");
|
||||
add("b");
|
||||
}
|
||||
}.iterator();
|
||||
ArrayList<String> result = MapUtil.valuesOfKeys(map, iterator);
|
||||
assertEquals(new ArrayList<String>() {
|
||||
private static final long serialVersionUID = 6383576410597048337L;
|
||||
{
|
||||
add("1");
|
||||
add(null);
|
||||
add("2");
|
||||
}
|
||||
}, result);
|
||||
}
|
||||
|
||||
//--------clear
|
||||
@Test
|
||||
public void clearNoMapsProvidedNoAction() {
|
||||
MapUtil.clear();
|
||||
// 预期没有异常发生，且没有Map被处理
|
||||
}
|
||||
|
||||
@Test
|
||||
public void clearEmptyMapNoChange() {
|
||||
Map<String, String> map = new HashMap<>();
|
||||
MapUtil.clear(map);
|
||||
assertTrue(map.isEmpty());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void clearNonEmptyMapClearsMap() {
|
||||
Map<String, String> map = new HashMap<>();
|
||||
map.put("key", "value");
|
||||
MapUtil.clear(map);
|
||||
assertTrue(map.isEmpty());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void clearMultipleMapsClearsNonEmptyMaps() {
|
||||
Map<String, String> map1 = new HashMap<>();
|
||||
map1.put("key1", "value1");
|
||||
|
||||
Map<String, String> map2 = new HashMap<>();
|
||||
map2.put("key2", "value2");
|
||||
|
||||
Map<String, String> map3 = new HashMap<>();
|
||||
|
||||
MapUtil.clear(map1, map2, map3);
|
||||
|
||||
assertTrue(map1.isEmpty());
|
||||
assertTrue(map2.isEmpty());
|
||||
assertTrue(map3.isEmpty());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void clearMixedMapsClearsNonEmptyMaps() {
|
||||
Map<String, String> map = new HashMap<>();
|
||||
map.put("key", "value");
|
||||
|
||||
Map<String, String> emptyMap = new HashMap<>();
|
||||
|
||||
MapUtil.clear(map, emptyMap);
|
||||
|
||||
assertTrue(map.isEmpty());
|
||||
assertTrue(emptyMap.isEmpty());
|
||||
}
|
||||
|
||||
//-----empty
|
||||
|
||||
@Test
|
||||
public void emptyNoParametersReturnsEmptyMap() {
|
||||
Map<String, String> emptyMap = MapUtil.empty();
|
||||
assertTrue(emptyMap.isEmpty(), "The map should be empty.");
|
||||
assertSame(Collections.emptyMap(), emptyMap, "The map should be the same instance as Collections.emptyMap().");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void emptyNullMapClassReturnsEmptyMap() {
|
||||
Map<String, String> emptyMap = MapUtil.empty(null);
|
||||
assertTrue(emptyMap.isEmpty(), "The map should be empty.");
|
||||
assertSame(Collections.emptyMap(), emptyMap, "The map should be the same instance as Collections.emptyMap().");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void emptyNavigableMapClassReturnsEmptyNavigableMap() {
|
||||
Map<?, ?> map = MapUtil.empty(NavigableMap.class);
|
||||
assertTrue(map.isEmpty());
|
||||
assertInstanceOf(NavigableMap.class, map);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void emptySortedMapClassReturnsEmptySortedMap() {
|
||||
Map<?, ?> map = MapUtil.empty(SortedMap.class);
|
||||
assertTrue(map.isEmpty());
|
||||
assertInstanceOf(SortedMap.class, map);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void emptyMapClassReturnsEmptyMap() {
|
||||
Map<?, ?> map = MapUtil.empty(Map.class);
|
||||
assertTrue(map.isEmpty());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void emptyUnsupportedMapClassThrowsIllegalArgumentException() {
|
||||
assertThrows(IllegalArgumentException.class, () -> {
|
||||
MapUtil.empty(TreeMap.class);
|
||||
});
|
||||
}
|
||||
|
||||
//--------removeNullValue
|
||||
@Test
|
||||
public void removeNullValueNullMapReturnsNull() {
|
||||
Map<String, String> result = MapUtil.removeNullValue(null);
|
||||
assertNull(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void removeNullValueEmptyMapReturnsEmptyMap() {
|
||||
Map<String, String> map = new HashMap<>();
|
||||
Map<String, String> result = MapUtil.removeNullValue(map);
|
||||
assertEquals(0, result.size());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void removeNullValueNoNullValuesReturnsSameMap() {
|
||||
Map<String, String> map = new HashMap<>();
|
||||
map.put("key1", "value1");
|
||||
map.put("key2", "value2");
|
||||
|
||||
Map<String, String> result = MapUtil.removeNullValue(map);
|
||||
|
||||
assertEquals(2, result.size());
|
||||
assertEquals("value1", result.get("key1"));
|
||||
assertEquals("value2", result.get("key2"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void removeNullValueWithNullValuesRemovesNullEntries() {
|
||||
Map<String, String> map = new HashMap<>();
|
||||
map.put("key1", "value1");
|
||||
map.put("key2", null);
|
||||
map.put("key3", "value3");
|
||||
|
||||
Map<String, String> result = MapUtil.removeNullValue(map);
|
||||
|
||||
assertEquals(2, result.size());
|
||||
assertEquals("value1", result.get("key1"));
|
||||
assertEquals("value3", result.get("key3"));
|
||||
assertNull(result.get("key2"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void removeNullValueAllNullValuesReturnsEmptyMap() {
|
||||
Map<String, String> map = new HashMap<>();
|
||||
map.put("key1", null);
|
||||
map.put("key2", null);
|
||||
|
||||
Map<String, String> result = MapUtil.removeNullValue(map);
|
||||
|
||||
assertEquals(0, result.size());
|
||||
}
|
||||
|
||||
|
||||
//------getQuietly
|
||||
@Test
|
||||
public void getQuietlyMapIsNullReturnsDefaultValue() {
|
||||
String result = MapUtil.getQuietly(null, "key1", new TypeReference<String>() {
|
||||
}, "default");
|
||||
assertEquals("default", result);
|
||||
result = MapUtil.getQuietly(null, "key1", String.class, "default");
|
||||
assertEquals("default", result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getQuietlyKeyExistsReturnsConvertedValue() {
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
map.put("key1", "value1");
|
||||
map.put("key2", 123);
|
||||
String result = MapUtil.getQuietly(map, "key1", new TypeReference<String>() {
|
||||
}, "default");
|
||||
assertEquals("value1", result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getQuietlyKeyDoesNotExistReturnsDefaultValue() {
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
map.put("key1", "value1");
|
||||
map.put("key2", 123);
|
||||
String result = MapUtil.getQuietly(map, "key3", new TypeReference<String>() {
|
||||
}, "default");
|
||||
assertEquals("default", result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getQuietlyConversionFailsReturnsDefaultValue() {
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
map.put("key1", "value1");
|
||||
map.put("key2", 123);
|
||||
Integer result = MapUtil.getQuietly(map, "key1", new TypeReference<Integer>() {
|
||||
}, 0);
|
||||
assertEquals(0, result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getQuietlyKeyExistsWithCorrectTypeReturnsValue() {
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
map.put("key1", "value1");
|
||||
map.put("key2", 123);
|
||||
Integer result = MapUtil.getQuietly(map, "key2", new TypeReference<Integer>() {
|
||||
}, 0);
|
||||
assertEquals(123, result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getQuietlyKeyExistsWithNullValueReturnsDefaultValue() {
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
map.put("key1", "value1");
|
||||
map.put("key2", 123);
|
||||
map.put("key3", null);
|
||||
String result = MapUtil.getQuietly(map, "key3", new TypeReference<String>() {
|
||||
}, "default");
|
||||
assertEquals("default", result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getMapIsNullReturnsDefaultValue() {
|
||||
assertNull(MapUtil.get(null, "age", String.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getKeyExistsReturnsConvertedValue() {
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
map.put("age", "18");
|
||||
map.put("name", "Hutool");
|
||||
assertEquals("18", MapUtil.get(map, "age", String.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getKeyDoesNotExistReturnsDefaultValue() {
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
map.put("age", "18");
|
||||
map.put("name", "Hutool");
|
||||
assertEquals("default", MapUtil.get(map, "nonexistent", String.class, "default"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getTypeConversionFailsReturnsDefaultValue() {
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
map.put("age", "18");
|
||||
map.put("name", "Hutool");
|
||||
assertEquals(18, MapUtil.get(map, "age", Integer.class, 0));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getQuietlyTypeConversionFailsReturnsDefaultValue() {
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
map.put("age", "18");
|
||||
map.put("name", "Hutool");
|
||||
assertEquals(0, MapUtil.getQuietly(map, "name", Integer.class, 0));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getTypeReferenceReturnsConvertedValue() {
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
map.put("age", "18");
|
||||
map.put("name", "Hutool");
|
||||
assertEquals("18", MapUtil.get(map, "age", new TypeReference<String>() {
|
||||
}));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getTypeReferenceWithDefaultValueReturnsConvertedValue() {
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
map.put("age", "18");
|
||||
map.put("name", "Hutool");
|
||||
assertEquals("18", MapUtil.get(map, "age", new TypeReference<String>() {
|
||||
}, "default"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getTypeReferenceWithDefaultValueTypeConversionFailsReturnsDefaultValue() {
|
||||
Map<String, String> map = new HashMap<>();
|
||||
map.put("age", "18");
|
||||
map.put("name", "Hutool");
|
||||
assertEquals(18, MapUtil.get(map, "age", new TypeReference<Integer>() {
|
||||
}, 0));
|
||||
|
||||
map = null;
|
||||
assertEquals(0, MapUtil.get(map, "age", new TypeReference<Integer>() {
|
||||
}, 0));
|
||||
}
|
||||
}
|
||||
|
||||
@ -7,7 +7,7 @@ import cn.hutool.core.lang.Console;
|
||||
import cn.hutool.core.map.MapBuilder;
|
||||
import cn.hutool.core.map.MapUtil;
|
||||
import lombok.Data;
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.Disabled;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.w3c.dom.Document;
|
||||
@ -22,6 +22,8 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
/**
|
||||
* {@link XmlUtil} 工具类
|
||||
*
|
||||
@ -319,7 +321,8 @@ public class XmlUtilTest {
|
||||
public void escapeTest(){
|
||||
final String a = "<>";
|
||||
final String escape = XmlUtil.escape(a);
|
||||
Console.log(escape);
|
||||
Assertions.assertEquals("<>", escape);
|
||||
Assertions.assertEquals("中文“双引号”", XmlUtil.escape("中文“双引号”"));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-parent</artifactId>
|
||||
<version>5.8.35</version>
|
||||
<version>5.8.36</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>hutool-cron</artifactId>
|
||||
|
||||
@ -17,7 +17,7 @@ public class CronTest {
|
||||
@Test
|
||||
@Disabled
|
||||
public void customCronTest() {
|
||||
CronUtil.schedule("*/2 * * * * *", (Task) () -> Console.log("Task excuted."));
|
||||
CronUtil.schedule("*/2 * * * * *", (Task) () -> Console.log("Task executed."));
|
||||
|
||||
// 支持秒级别定时任务
|
||||
CronUtil.setMatchSecond(true);
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-parent</artifactId>
|
||||
<version>5.8.35</version>
|
||||
<version>5.8.36</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>hutool-crypto</artifactId>
|
||||
|
||||
@ -14,7 +14,9 @@ import org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util;
|
||||
import org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil;
|
||||
import org.bouncycastle.jce.spec.ECNamedCurveSpec;
|
||||
import org.bouncycastle.jce.spec.ECParameterSpec;
|
||||
import org.bouncycastle.jce.spec.ECPrivateKeySpec;
|
||||
import org.bouncycastle.math.ec.ECCurve;
|
||||
import org.bouncycastle.util.BigIntegers;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
@ -44,6 +46,27 @@ public class BCUtil {
|
||||
return ((BCECPrivateKey) privateKey).getD().toByteArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* 解码恢复EC私钥,支持Base64和Hex编码,（基于BouncyCastle）
|
||||
*
|
||||
* @param d 私钥d值
|
||||
* @param curveName EC曲线名
|
||||
* @return 私钥
|
||||
* @since 5.8.36
|
||||
*/
|
||||
public static PrivateKey decodeECPrivateKey(final byte[] d, final String curveName) {
|
||||
final X9ECParameters x9ECParameters = ECUtil.getNamedCurveByName(curveName);
|
||||
final ECParameterSpec ecSpec = new ECParameterSpec(
|
||||
x9ECParameters.getCurve(),
|
||||
x9ECParameters.getG(),
|
||||
x9ECParameters.getN(),
|
||||
x9ECParameters.getH()
|
||||
);
|
||||
|
||||
final ECPrivateKeySpec privateKeySpec = new ECPrivateKeySpec(BigIntegers.fromUnsignedByteArray(d), ecSpec);
|
||||
return KeyUtil.generatePrivateKey("EC", privateKeySpec);
|
||||
}
|
||||
|
||||
/**
|
||||
* 编码压缩EC公钥（基于BouncyCastle），即Q值<br>
|
||||
* 见：https://www.cnblogs.com/xinzhao/p/8963724.html
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-parent</artifactId>
|
||||
<version>5.8.35</version>
|
||||
<version>5.8.36</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>hutool-db</artifactId>
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
package cn.hutool.db;
|
||||
|
||||
import cn.hutool.core.io.resource.NoResourceException;
|
||||
import cn.hutool.core.util.ArrayUtil;
|
||||
import cn.hutool.db.sql.SqlLog;
|
||||
import cn.hutool.log.level.Level;
|
||||
import cn.hutool.setting.Setting;
|
||||
@ -83,20 +84,30 @@ public class GlobalDbConfig {
|
||||
throw new NoResourceException("Customize db setting file [{}] not found !", dbSettingPath);
|
||||
}
|
||||
} else {
|
||||
try {
|
||||
setting = new Setting(DEFAULT_DB_SETTING_PATH, true);
|
||||
} catch (NoResourceException e) {
|
||||
// 尝试ClassPath下直接读取配置文件
|
||||
try {
|
||||
setting = new Setting(DEFAULT_DB_SETTING_PATH2, true);
|
||||
} catch (NoResourceException e2) {
|
||||
throw new NoResourceException("Default db setting [{}] or [{}] in classpath not found !", DEFAULT_DB_SETTING_PATH, DEFAULT_DB_SETTING_PATH2);
|
||||
}
|
||||
}
|
||||
setting = tryDefaultDbSetting();
|
||||
}
|
||||
return setting;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取自定义或默认位置数据库配置{@link Setting}
|
||||
*
|
||||
* @return 数据库配置
|
||||
* @since 5.8.36
|
||||
*/
|
||||
private static Setting tryDefaultDbSetting() {
|
||||
final String[] defaultDbSettingPaths = {"file:" + DEFAULT_DB_SETTING_PATH, "file:" + DEFAULT_DB_SETTING_PATH2, DEFAULT_DB_SETTING_PATH, DEFAULT_DB_SETTING_PATH2};
|
||||
for (final String settingPath : defaultDbSettingPaths) {
|
||||
try {
|
||||
return new Setting(settingPath, true);
|
||||
} catch (final NoResourceException e) {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
|
||||
throw new NoResourceException("Default db settings [{}] in classpath not found !", ArrayUtil.join(defaultDbSettingPaths, ","));
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置全局配置：是否通过debug日志显示SQL
|
||||
*
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-parent</artifactId>
|
||||
<version>5.8.35</version>
|
||||
<version>5.8.36</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>hutool-dfa</artifactId>
|
||||
|
||||
@ -1,37 +1,37 @@
|
||||
package cn.hutool.dfa;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* 过滤词及一些简单处理
|
||||
*
|
||||
*
|
||||
* @author Looly
|
||||
*/
|
||||
public class StopChar {
|
||||
/** 不需要处理的词，如标点符号、空格等 */
|
||||
public static final Set<Character> STOP_WORD = CollUtil.newHashSet(' ', '\'', '、', '。', //
|
||||
'·', 'ˉ', 'ˇ', '々', '—', '～', '‖', '…', '‘', '’', '“', '”', '〔', '〕', '〈', '〉', '《', '》', '「', '」', '『', //
|
||||
'』', '〖', '〗', '【', '】', '±', '＋', '－', '×', '÷', '∧', '∨', '∑', '∏', '∪', '∩', '∈', '√', '⊥', '⊙', '∫', //
|
||||
'∮', '≡', '≌', '≈', '∽', '∝', '≠', '≮', '≯', '≤', '≥', '∞', '∶', '∵', '∴', '∷', '♂', '♀', '°', '′', '〃', //
|
||||
'℃', '＄', '¤', '￠', '￡', '‰', '§', '☆', '★', '〇', '○', '●', '◎', '◇', '◆', '□', '■', '△', '▽', '⊿', '▲', //
|
||||
'▼', '◣', '◤', '◢', '◥', '▁', '▂', '▃', '▄', '▅', '▆', '▇', '█', '▉', '▊', '▋', '▌', '▍', '▎', '▏', '▓', //
|
||||
'※', '→', '←', '↑', '↓', '↖', '↗', '↘', '↙', '〓', 'ⅰ', 'ⅱ', 'ⅲ', 'ⅳ', 'ⅴ', 'ⅵ', 'ⅶ', 'ⅷ', 'ⅸ', 'ⅹ', '①', //
|
||||
'②', '③', '④', '⑤', '⑥', '⑦', '⑧', '⑨', '⑩', '⒈', '⒉', '⒊', '⒋', '⒌', '⒍', '⒎', '⒏', '⒐', '⒑', '⒒', '⒓', //
|
||||
'⒔', '⒕', '⒖', '⒗', '⒘', '⒙', '⒚', '⒛', '⑴', '⑵', '⑶', '⑷', '⑸', '⑹', '⑺', '⑻', '⑼', '⑽', '⑾', '⑿', '⒀', //
|
||||
'⒁', '⒂', '⒃', '⒄', '⒅', '⒆', '⒇', 'Ⅰ', 'Ⅱ', 'Ⅲ', 'Ⅳ', 'Ⅴ', 'Ⅵ', 'Ⅶ', 'Ⅷ', 'Ⅸ', 'Ⅹ', 'Ⅺ', 'Ⅻ', '！', '”', //
|
||||
'＃', '￥', '％', '＆', '’', '（', '）', '＊', '＋', '，', '－', '．', '／', '０', '１', '２', '３', '４', '５', '６', '７', //
|
||||
'８', '９', '：', '；', '＜', '＝', '＞', '？', '＠', '〔', '＼', '〕', '＾', '＿', '‘', '｛', '｜', '｝', '∏', 'Ρ', '∑', //
|
||||
'Υ', 'Φ', 'Χ', 'Ψ', 'Ω', 'α', 'β', 'γ', 'δ', 'ε', 'ζ', 'η', 'θ', 'ι', 'κ', 'λ', 'μ', 'ν', 'ξ', 'ο', 'π', //
|
||||
'ρ', 'σ', 'τ', 'υ', 'φ', 'χ', 'ψ', 'ω', '（', '）', '〔', '〕', '＾', '﹊', '﹍', '╭', '╮', '╰', '╯', '', '_', //
|
||||
'', '^', '（', '^', '：', '！', '/', '\\', '\"', '<', '>', '`', '·', '。', '{', '}', '~', '～', '(', ')', '-', //
|
||||
'√', '$', '@', '*', '&', '#', '卐', '㎎', '㎏', '㎜', '㎝', '㎞', '㎡', '㏄', '㏎', '㏑', '㏒', '㏕', '+', '=', '?',
|
||||
':', '.', '!', ';', ']','|','%');
|
||||
'·', 'ˉ', 'ˇ', '々', '—', '～', '‖', '…', '‘', '’', '“', '”', '〔', '〕', '〈', '〉', '《', '》', '「', '」', '『', //
|
||||
'』', '〖', '〗', '【', '】', '±', '＋', '－', '×', '÷', '∧', '∨', '∑', '∏', '∪', '∩', '∈', '√', '⊥', '⊙', '∫', //
|
||||
'∮', '≡', '≌', '≈', '∽', '∝', '≠', '≮', '≯', '≤', '≥', '∞', '∶', '∵', '∴', '∷', '♂', '♀', '°', '′', '〃', //
|
||||
'℃', '＄', '¤', '￠', '￡', '‰', '§', '☆', '★', '〇', '○', '●', '◎', '◇', '◆', '□', '■', '△', '▽', '⊿', '▲', //
|
||||
'▼', '◣', '◤', '◢', '◥', '▁', '▂', '▃', '▄', '▅', '▆', '▇', '█', '▉', '▊', '▋', '▌', '▍', '▎', '▏', '▓', //
|
||||
'※', '→', '←', '↑', '↓', '↖', '↗', '↘', '↙', '〓', 'ⅰ', 'ⅱ', 'ⅲ', 'ⅳ', 'ⅴ', 'ⅵ', 'ⅶ', 'ⅷ', 'ⅸ', 'ⅹ', '①', //
|
||||
'②', '③', '④', '⑤', '⑥', '⑦', '⑧', '⑨', '⑩', '⒈', '⒉', '⒊', '⒋', '⒌', '⒍', '⒎', '⒏', '⒐', '⒑', '⒒', '⒓', //
|
||||
'⒔', '⒕', '⒖', '⒗', '⒘', '⒙', '⒚', '⒛', '⑴', '⑵', '⑶', '⑷', '⑸', '⑹', '⑺', '⑻', '⑼', '⑽', '⑾', '⑿', '⒀', //
|
||||
'⒁', '⒂', '⒃', '⒄', '⒅', '⒆', '⒇', 'Ⅰ', 'Ⅱ', 'Ⅲ', 'Ⅳ', 'Ⅴ', 'Ⅵ', 'Ⅶ', 'Ⅷ', 'Ⅸ', 'Ⅹ', 'Ⅺ', 'Ⅻ', '！', //
|
||||
'＃', '￥', '％', '＆', '（', '）', '＊', '，', '．', '／', '０', '１', '２', '３', '４', '５', '６', '７', //
|
||||
'８', '９', '：', '；', '＜', '＝', '＞', '？', '＠', '〔', '＼', '〕', '＾', '＿', '‘', '｛', '｜', '｝', 'Ρ', //
|
||||
'Υ', 'Φ', 'Χ', 'Ψ', 'Ω', 'α', 'β', 'γ', 'δ', 'ε', 'ζ', 'η', 'θ', 'ι', 'κ', 'λ', 'μ', 'ν', 'ξ', 'ο', 'π', //
|
||||
'ρ', 'σ', 'τ', 'υ', 'φ', 'χ', 'ψ', 'ω', '（', '）', '＾', '﹊', '﹍', '╭', '╮', '╰', '╯', '', '_', //
|
||||
'', '^', '（', '：', '！', '/', '\\', '\"', '<', '>', '`', '{', '}', '~', '(', ')', '-', //
|
||||
'$', '@', '*', '&', '#', '卐', '㎎', '㎏', '㎜', '㎝', '㎞', '㎡', '㏄', '㏎', '㏑', '㏒', '㏕', '+', '=', '?',
|
||||
':', '.', '!', ';', ']','|','%');
|
||||
|
||||
/**
|
||||
* 判断指定的词是否是不处理的词。 如果参数为空，则返回true，因为空也属于不处理的字符。
|
||||
*
|
||||
*
|
||||
* @param ch 指定的词
|
||||
* @return 是否是不处理的词
|
||||
*/
|
||||
@ -41,7 +41,7 @@ public class StopChar {
|
||||
|
||||
/**
|
||||
* 是否为合法字符（待处理字符）
|
||||
*
|
||||
*
|
||||
* @param ch 指定的词
|
||||
* @return 是否为合法字符（待处理字符）
|
||||
*/
|
||||
|
||||
@ -1,11 +1,12 @@
|
||||
package cn.hutool.dfa;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
/**
|
||||
* DFA单元测试
|
||||
*
|
||||
@ -27,7 +28,7 @@ public class DfaTest {
|
||||
// 匹配到【大】，就不再继续匹配了，因此【大土豆】不匹配
|
||||
// 匹配到【刚出锅】，就跳过这三个字了，因此【出锅】不匹配（由于刚首先被匹配，因此长的被匹配，最短匹配只针对第一个字相同选最短）
|
||||
List<String> matchAll = tree.matchAll(text, -1, false, false);
|
||||
assertEquals(matchAll, CollUtil.newArrayList("大", "土^豆", "刚出锅"));
|
||||
assertEquals(CollUtil.newArrayList("大", "土^豆", "刚出锅"), matchAll);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-parent</artifactId>
|
||||
<version>5.8.35</version>
|
||||
<version>5.8.36</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>hutool-extra</artifactId>
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-parent</artifactId>
|
||||
<version>5.8.35</version>
|
||||
<version>5.8.36</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>hutool-http</artifactId>
|
||||
|
||||
@ -24,6 +24,7 @@ public class HtmlUtil {
|
||||
public static final String GT = StrUtil.HTML_GT;
|
||||
|
||||
public static final String RE_HTML_MARK = "(<[^<]*?>)|(<[\\s]*?/[^<]*?>)|(<[^<]*?/[\\s]*?>)";
|
||||
public static final String RE_HTML_EMPTY_MARK = "<(\\w+)([^>]*)>\\s*</\\1>";
|
||||
public static final String RE_SCRIPT = "<[\\s]*?script[^>]*?>.*?<[\\s]*?\\/[\\s]*?script[\\s]*?>";
|
||||
|
||||
private static final char[][] TEXT = new char[256][];
|
||||
@ -86,6 +87,17 @@ public class HtmlUtil {
|
||||
return content.replaceAll(RE_HTML_MARK, "");
|
||||
}
|
||||
|
||||
/**
|
||||
* 清除所有HTML空标签<br>
|
||||
* 例如：<p></p>
|
||||
*
|
||||
* @param content 文本
|
||||
* @return 清除空标签后的文本
|
||||
*/
|
||||
public static String cleanEmptyTag(String content) {
|
||||
return content.replaceAll(RE_HTML_EMPTY_MARK, "");
|
||||
}
|
||||
|
||||
/**
|
||||
* 清除指定HTML标签和被标签包围的内容<br>
|
||||
* 不区分大小写
|
||||
|
||||
@ -36,6 +36,7 @@ public class OS extends UserAgentInfo {
|
||||
new OS("Windows", "windows"), //
|
||||
new OS("OSX", "os x (\\d+)[._](\\d+)", "os x (\\d+([._]\\d+)*)"), //
|
||||
new OS("Android", "Android", "Android (\\d+([._]\\d+)*)"),//
|
||||
new OS("Harmony", "OpenHarmony", "OpenHarmony (\\d+([._]\\d+)*)"), //
|
||||
new OS("Android", "XiaoMi|MI\\s+", "\\(X(\\d+([._]\\d+)*)"),//
|
||||
new OS("Linux", "linux"), //
|
||||
new OS("Wii", "wii", "wii libnup/(\\d+([._]\\d+)*)"), //
|
||||
|
||||
@ -36,6 +36,11 @@ public class Platform extends UserAgentInfo {
|
||||
* android
|
||||
*/
|
||||
public static final Platform ANDROID = new Platform("Android", "android");
|
||||
|
||||
/**
|
||||
* harmony
|
||||
*/
|
||||
public static final Platform HARMONY = new Platform("Harmony", "OpenHarmony");
|
||||
/**
|
||||
* android
|
||||
*/
|
||||
@ -59,7 +64,8 @@ public class Platform extends UserAgentInfo {
|
||||
GOOGLE_TV, //
|
||||
new Platform("htcFlyer", "htc_flyer"), //
|
||||
new Platform("Symbian", "symbian(os)?"), //
|
||||
new Platform("Blackberry", "blackberry") //
|
||||
new Platform("Blackberry", "blackberry"), //
|
||||
HARMONY
|
||||
);
|
||||
|
||||
/**
|
||||
@ -144,4 +150,13 @@ public class Platform extends UserAgentInfo {
|
||||
return this.equals(ANDROID) || this.equals(GOOGLE_TV);
|
||||
}
|
||||
|
||||
/**
|
||||
* 是否为Harmony平台
|
||||
*
|
||||
* @return 是否为Harmony平台
|
||||
*/
|
||||
public boolean isHarmony() {
|
||||
return this.equals(HARMONY);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -1,8 +1,9 @@
|
||||
package cn.hutool.http;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
|
||||
/**
|
||||
* Html单元测试
|
||||
*
|
||||
@ -77,6 +78,29 @@ public class HtmlUtilTest {
|
||||
assertEquals("pre\r\n\t\tdfdsfdsfdsf\r\nBBBB", result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void cleanEmptyTagTest() {
|
||||
String str = "<p></p><div></div>";
|
||||
String result = HtmlUtil.cleanEmptyTag(str);
|
||||
assertEquals("", result);
|
||||
|
||||
str = "<p>TEXT</p><div></div>";
|
||||
result = HtmlUtil.cleanEmptyTag(str);
|
||||
assertEquals("<p>TEXT</p>", result);
|
||||
|
||||
str = "<p></p><div>TEXT</div>";
|
||||
result = HtmlUtil.cleanEmptyTag(str);
|
||||
assertEquals("<div>TEXT</div>", result);
|
||||
|
||||
str = "<p>TEXT</p><div>TEXT</div>";
|
||||
result = HtmlUtil.cleanEmptyTag(str);
|
||||
assertEquals("<p>TEXT</p><div>TEXT</div>", result);
|
||||
|
||||
str = "TEXT<p></p><div></div>TEXT";
|
||||
result = HtmlUtil.cleanEmptyTag(str);
|
||||
assertEquals("TEXTTEXT", result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void unwrapHtmlTagTest() {
|
||||
//非闭合标签
|
||||
|
||||
@ -413,6 +413,16 @@ public class UserAgentUtilTest {
|
||||
assertEquals("Linux", ua.getOs().toString());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void parseHarmonyUATest() {
|
||||
final String uaStr = "Mozilla/5.0 (Phone; OpenHarmony 4.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36 ArkWeb/4.1.6.1 Mobile ";
|
||||
final UserAgent ua = UserAgentUtil.parse(uaStr);
|
||||
assertEquals("Harmony", ua.getPlatform().toString());
|
||||
assertTrue(ua.getPlatform().isHarmony());
|
||||
assertEquals("Harmony", ua.getOs().toString());
|
||||
assertEquals("4.1", ua.getOsVersion());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void issueI60UOPTest() {
|
||||
final String uaStr = "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.164 Safari/537.36 dingtalk-win/1.0.0 nw(0.14.7) DingTalk(6.5.40-Release.9059101) Mojo/1.0.0 Native AppType(release) Channel/201200";
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-parent</artifactId>
|
||||
<version>5.8.35</version>
|
||||
<version>5.8.36</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>hutool-json</artifactId>
|
||||
|
||||
@ -117,6 +117,7 @@ public interface JSON extends Cloneable, Serializable, IJSONTypeConverter {
|
||||
*
|
||||
* @param expression 表达式
|
||||
* @param targetType 返回值类型
|
||||
* @param <T> 获取对象类型
|
||||
* @return 对象
|
||||
* @see BeanPath#get(Object)
|
||||
* @since 5.8.34
|
||||
|
||||
@ -729,4 +729,15 @@ public class JSONObjectTest {
|
||||
});
|
||||
assertEquals("value2_edit", jsonObject.get("b"));
|
||||
}
|
||||
|
||||
@Test
|
||||
void issue3844Test(){
|
||||
String camelCaseStr = "{\"userAge\":\"123\"}";
|
||||
final JSONObject entries = new JSONObject(camelCaseStr, null, (pair) -> {
|
||||
pair.setKey(StrUtil.toUnderlineCase(pair.getKey()));
|
||||
return true;
|
||||
});
|
||||
|
||||
Console.log(entries);
|
||||
}
|
||||
}
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-parent</artifactId>
|
||||
<version>5.8.35</version>
|
||||
<version>5.8.36</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>hutool-jwt</artifactId>
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-parent</artifactId>
|
||||
<version>5.8.35</version>
|
||||
<version>5.8.36</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>hutool-log</artifactId>
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-parent</artifactId>
|
||||
<version>5.8.35</version>
|
||||
<version>5.8.36</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>hutool-poi</artifactId>
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-parent</artifactId>
|
||||
<version>5.8.35</version>
|
||||
<version>5.8.36</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>hutool-script</artifactId>
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-parent</artifactId>
|
||||
<version>5.8.35</version>
|
||||
<version>5.8.36</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>hutool-setting</artifactId>
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-parent</artifactId>
|
||||
<version>5.8.35</version>
|
||||
<version>5.8.36</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>hutool-socket</artifactId>
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-parent</artifactId>
|
||||
<version>5.8.35</version>
|
||||
<version>5.8.36</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>hutool-system</artifactId>
|
||||
|
||||
4
pom.xml
4
pom.xml
@ -8,7 +8,7 @@
|
||||
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-parent</artifactId>
|
||||
<version>5.8.35</version>
|
||||
<version>5.8.36</version>
|
||||
<name>hutool</name>
|
||||
<description>Hutool是一个小而全的Java工具类库，通过静态方法封装，降低相关API的学习成本，提高工作效率，使Java拥有函数式语言般的优雅，让Java语言也可以“甜甜的”。</description>
|
||||
<url>https://github.com/dromara/hutool</url>
|
||||
@ -126,7 +126,7 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>3.8.0</version>
|
||||
<version>3.11.2</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>package</phase>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user