zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly
2022-05-05 00:55:02 +08:00
parent 29255272b5
commit 663be40590
17 changed files with 130 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hutool-setting/src/main/java/cn/hutool/setting/AbsSetting.java
View File

@@ -5,9 +5,9 @@ import cn.hutool.core.bean.copier.CopyOptions;
import cn.hutool.core.bean.copier.ValueProvider;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.getter.OptNullBasicTypeFromStringGetter;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.reflect.ReflectUtil;
import cn.hutool.core.reflect.ConstructorUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.log.Log;
import cn.hutool.log.LogFactory;
@@ -311,7 +311,7 @@ public abstract class AbsSetting implements OptNullBasicTypeFromStringGetter<Str
* @since 5.0.6
*/
public <T> T toBean(final String group, final Class<T> beanClass) {
return toBean(group, ReflectUtil.newInstanceIfPossible(beanClass));
return toBean(group, ConstructorUtil.newInstanceIfPossible(beanClass));
}
/**

10
hutool-setting/src/main/java/cn/hutool/setting/dialect/Props.java
View File

@@ -2,8 +2,6 @@ package cn.hutool.setting.dialect;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.getter.BasicTypeGetter;
import cn.hutool.core.lang.getter.OptBasicTypeGetter;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.IORuntimeException;
import cn.hutool.core.io.IoUtil;
@@ -16,10 +14,12 @@ import cn.hutool.core.io.watch.SimpleWatcher;
import cn.hutool.core.io.watch.WatchMonitor;
import cn.hutool.core.io.watch.WatchUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.lang.getter.BasicTypeGetter;
import cn.hutool.core.lang.getter.OptBasicTypeGetter;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.reflect.ReflectUtil;
import cn.hutool.core.reflect.ConstructorUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.log.StaticLog;
import java.io.BufferedReader;
@@ -549,7 +549,7 @@ public final class Props extends Properties implements BasicTypeGetter<String>,
* @since 4.6.3
*/
public <T> T toBean(final Class<T> beanClass, final String prefix) {
final T bean = ReflectUtil.newInstanceIfPossible(beanClass);
final T bean = ConstructorUtil.newInstanceIfPossible(beanClass);
return fillBean(bean, prefix);
}