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

8
hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/ProxyFactory.java
View File

@@ -1,8 +1,8 @@
package cn.hutool.extra.aop.proxy;
import cn.hutool.extra.aop.aspects.Aspect;
import cn.hutool.core.reflect.ReflectUtil;
import cn.hutool.core.reflect.ConstructorUtil;
import cn.hutool.core.util.ServiceLoaderUtil;
import cn.hutool.extra.aop.aspects.Aspect;
import java.io.Serializable;
@@ -25,7 +25,7 @@ public abstract class ProxyFactory implements Serializable {
* @since 5.3.1
*/
public <T> T proxy(final T target, final Class<? extends Aspect> aspectClass) {
return proxy(target, ReflectUtil.newInstanceIfPossible(aspectClass));
return proxy(target, ConstructorUtil.newInstanceIfPossible(aspectClass));
}
/**
@@ -47,7 +47,7 @@ public abstract class ProxyFactory implements Serializable {
* @return 代理对象
*/
public static <T> T createProxy(final T target, final Class<? extends Aspect> aspectClass) {
return createProxy(target, ReflectUtil.newInstance(aspectClass));
return createProxy(target, ConstructorUtil.newInstance(aspectClass));
}
/**

6
hutool-extra/src/main/java/cn/hutool/extra/cglib/CglibUtil.java
View File

@@ -1,7 +1,7 @@
package cn.hutool.extra.cglib;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.reflect.ReflectUtil;
import cn.hutool.core.reflect.ConstructorUtil;
import net.sf.cglib.beans.BeanCopier;
import net.sf.cglib.beans.BeanMap;
import net.sf.cglib.core.Converter;
@@ -45,7 +45,7 @@ public class CglibUtil {
* @return 目标对象
*/
public static <T> T copy(final Object source, final Class<T> targetClass, final Converter converter) {
final T target = ReflectUtil.newInstanceIfPossible(targetClass);
final T target = ConstructorUtil.newInstanceIfPossible(targetClass);
copy(source, target, converter);
return target;
}
@@ -178,6 +178,6 @@ public class CglibUtil {
*/
@SuppressWarnings("rawtypes")
public static <T> T toBean(final Map map, final Class<T> beanClass){
return fillBean(map, ReflectUtil.newInstanceIfPossible(beanClass));
return fillBean(map, ConstructorUtil.newInstanceIfPossible(beanClass));
}
}

6
hutool-extra/src/main/java/cn/hutool/extra/servlet/JakartaServletUtil.java
View File

@@ -15,11 +15,11 @@ import cn.hutool.core.net.NetUtil;
import cn.hutool.core.net.URLEncoder;
import cn.hutool.core.net.multipart.MultipartFormData;
import cn.hutool.core.net.multipart.UploadSetting;
import cn.hutool.core.reflect.ConstructorUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.reflect.ReflectUtil;
import cn.hutool.core.text.StrUtil;
import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.http.Cookie;
@@ -182,7 +182,7 @@ public class JakartaServletUtil {
* @return Bean
*/
public static <T> T toBean(final ServletRequest request, final Class<T> beanClass, final boolean isIgnoreError) {
return fillBean(request, ReflectUtil.newInstanceIfPossible(beanClass), isIgnoreError);
return fillBean(request, ConstructorUtil.newInstanceIfPossible(beanClass), isIgnoreError);
}
// --------------------------------------------------------- fillBean end

6
hutool-extra/src/main/java/cn/hutool/extra/servlet/ServletUtil.java
View File

@@ -15,11 +15,11 @@ import cn.hutool.core.net.NetUtil;
import cn.hutool.core.net.URLEncoder;
import cn.hutool.core.net.multipart.MultipartFormData;
import cn.hutool.core.net.multipart.UploadSetting;
import cn.hutool.core.reflect.ConstructorUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.reflect.ReflectUtil;
import cn.hutool.core.text.StrUtil;
import javax.servlet.ServletOutputStream;
import javax.servlet.ServletRequest;
@@ -182,7 +182,7 @@ public class ServletUtil {
* @return Bean
*/
public static <T> T toBean(final ServletRequest request, final Class<T> beanClass, final boolean isIgnoreError) {
return fillBean(request, ReflectUtil.newInstanceIfPossible(beanClass), isIgnoreError);
return fillBean(request, ConstructorUtil.newInstanceIfPossible(beanClass), isIgnoreError);
}
// --------------------------------------------------------- fillBean end

6
hutool-extra/src/main/java/cn/hutool/extra/template/engine/TemplateFactory.java
View File

@@ -1,9 +1,9 @@
package cn.hutool.extra.template.engine;
import cn.hutool.core.lang.Singleton;
import cn.hutool.core.reflect.ReflectUtil;
import cn.hutool.core.util.ServiceLoaderUtil;
import cn.hutool.core.reflect.ConstructorUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.core.util.ServiceLoaderUtil;
import cn.hutool.extra.template.TemplateConfig;
import cn.hutool.extra.template.TemplateEngine;
import cn.hutool.extra.template.TemplateException;
@@ -61,7 +61,7 @@ public class TemplateFactory {
final Class<? extends TemplateEngine> customEngineClass = config.getCustomEngine();
final TemplateEngine engine;
if(null != customEngineClass){
engine = ReflectUtil.newInstance(customEngineClass);
engine = ConstructorUtil.newInstance(customEngineClass);
}else{
engine = ServiceLoaderUtil.loadFirstAvailable(TemplateEngine.class);
}