ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复修复Convert不能转换Optional和Opt问题

Browse Source
This commit is contained in:
Looly 2023-08-31 10:52:33 +08:00
parent cf9cee0b6c
commit e6c6f7e068
2 changed files with 63 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hutool-core/src/main/java/org/dromara/hutool/core/convert/CompositeConverter.java
View File

@ -15,6 +15,7 @@ package org.dromara.hutool.core.convert;
import org.dromara.hutool.core.bean.BeanUtil; import org.dromara.hutool.core.bean.BeanUtil;
import org.dromara.hutool.core.bean.RecordUtil; import org.dromara.hutool.core.bean.RecordUtil;
import org.dromara.hutool.core.convert.impl.*; import org.dromara.hutool.core.convert.impl.*;
import org.dromara.hutool.core.lang.Opt;
import org.dromara.hutool.core.reflect.TypeReference; import org.dromara.hutool.core.reflect.TypeReference;
import org.dromara.hutool.core.reflect.TypeUtil; import org.dromara.hutool.core.reflect.TypeUtil;
import org.dromara.hutool.core.reflect.kotlin.KClassUtil; import org.dromara.hutool.core.reflect.kotlin.KClassUtil;
@ -24,6 +25,7 @@ import java.lang.reflect.Type;
import java.util.Collection; import java.util.Collection;
import java.util.Date; import java.util.Date;
import java.util.Map; import java.util.Map;
import java.util.Optional;
/** /**
* 复合转换器，融合了所有支持类型和自定义类型的转换规则 * 复合转换器，融合了所有支持类型和自定义类型的转换规则
@ -106,7 +108,7 @@ public class CompositeConverter extends RegisterConverter {
* @throws ConvertException 转换器不存在 * @throws ConvertException 转换器不存在
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public <T> T convert(Type type, final Object value, final T defaultValue, final boolean isCustomFirst) throws ConvertException { public <T> T convert(Type type, Object value, final T defaultValue, final boolean isCustomFirst) throws ConvertException {
if (ObjUtil.isNull(value)) { if (ObjUtil.isNull(value)) {
return defaultValue; return defaultValue;
} }
@ -118,6 +120,20 @@ public class CompositeConverter extends RegisterConverter {
type = defaultValue.getClass(); type = defaultValue.getClass();
} }
// issue#I7WJHH，Opt和Optional处理
if (value instanceof Opt) {
value = ((Opt<T>) value).get();
if (ObjUtil.isNull(value)) {
return defaultValue;
}
}
if (value instanceof Optional) {
value = ((Optional<T>) value).orElse(null);
if (ObjUtil.isNull(value)) {
return defaultValue;
}
}
// value本身实现了Converter接口，直接调用 // value本身实现了Converter接口，直接调用
if (value instanceof Converter) { if (value instanceof Converter) {
return ((Converter) value).convert(type, value, defaultValue); return ((Converter) value).convert(type, value, defaultValue);

37
hutool-core/src/test/java/org/dromara/hutool/core/convert/IssueI7WJHHTest.java Executable file
View File

@ -0,0 +1,37 @@
/*
* Copyright (c) 2023 looly(loolly@aliyun.com)
* Hutool is licensed under Mulan PSL v2.
* You can use this software according to the terms and conditions of the Mulan PSL v2.
* You may obtain a copy of Mulan PSL v2 at:
* https://license.coscl.org.cn/MulanPSL2
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.core.convert;
import org.dromara.hutool.core.lang.Opt;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import java.util.Optional;
public class IssueI7WJHHTest {
@Test
public void toIntTest() {
final Optional<Integer> optional = Optional.of(1);
final Integer integer = Convert.toInt(optional);
Assertions.assertEquals(Integer.valueOf(1), integer);
}
@Test
public void toIntTest2() {
final Opt<Integer> optional = Opt.of(1);
final Integer integer = Convert.toInt(optional);
Assertions.assertEquals(Integer.valueOf(1), integer);
}
}