ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-04-19 03:01:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

!1121 [v6] [Improve] 修改BeanUtil.copyProperties返回值为target

Browse Source 
Merge pull request !1121 from 阿超/v6-dev
This commit is contained in:
Looly 2023-12-04 15:52:40 +00:00 committed by Gitee
commit 1357908d54
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanUtil.java
View File

@ -680,8 +680,7 @@ public class BeanUtil {
return (T) RecordConverter.INSTANCE.convert(tClass, source);
}
final T target = ConstructorUtil.newInstanceIfPossible(tClass);
copyProperties(source, target, CopyOptions.of().setIgnoreProperties(ignoreProperties));
return target;
return copyProperties(source, target, CopyOptions.of().setIgnoreProperties(ignoreProperties));
}
/**
@ -692,8 +691,8 @@ public class BeanUtil {
* @param target 目标Bean对象
* @param ignoreProperties 不拷贝的的属性列表
*/
public static void copyProperties(final Object source, final Object target, final String... ignoreProperties) {
copyProperties(source, target, CopyOptions.of().setIgnoreProperties(ignoreProperties));
public static <T> T copyProperties(final Object source, final T target, final String... ignoreProperties) {
return copyProperties(source, target, CopyOptions.of().setIgnoreProperties(ignoreProperties));
}
/**
@ -703,8 +702,8 @@ public class BeanUtil {
* @param target 目标Bean对象
* @param ignoreCase 是否忽略大小写
*/
public static void copyProperties(final Object source, final Object target, final boolean ignoreCase) {
BeanCopier.of(source, target, CopyOptions.of().setIgnoreCase(ignoreCase)).copy();
public static <T> T copyProperties(final Object source, final T target, final boolean ignoreCase) {
return BeanCopier.of(source, target, CopyOptions.of().setIgnoreCase(ignoreCase)).copy();
}
/**
@ -715,11 +714,11 @@ public class BeanUtil {
* @param target 目标Bean对象
* @param copyOptions 拷贝选项，见 {@link CopyOptions}
*/
public static void copyProperties(final Object source, final Object target, final CopyOptions copyOptions) {
public static <T> T copyProperties(final Object source, final T target, final CopyOptions copyOptions) {
if (null == source || null == target) {
return;
return null;
}
BeanCopier.of(source, target, ObjUtil.defaultIfNull(copyOptions, CopyOptions::of)).copy();
return BeanCopier.of(source, target, ObjUtil.defaultIfNull(copyOptions, CopyOptions::of)).copy();
}
/**