mirror of
https://gitee.com/chinabugotech/hutool.git
synced 2025-05-09 23:51:34 +08:00
!245 DynaBean.create 方法重载参数匹配问题
Merge pull request !245 from jjzhangjj/v5-dev
This commit is contained in:
Looly
Gitee
commit
6837180fc6
@ -16,187 +16,207 @@ import java.util.Map;
|
|||||||
* @since 3.0.7
|
* @since 3.0.7
|
||||||
*/
|
*/
|
||||||
public class DynaBean extends CloneSupport<DynaBean> implements Serializable {
|
public class DynaBean extends CloneSupport<DynaBean> implements Serializable {
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
private final Class<?> beanClass;
|
private final Class<?> beanClass;
|
||||||
private final Object bean;
|
private final Object bean;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 创建一个{@link DynaBean}
|
* 创建一个{@link DynaBean}
|
||||||
*
|
*
|
||||||
* @param bean 普通Bean
|
* @param bean 普通Bean
|
||||||
* @return {@link DynaBean}
|
* @return {@link DynaBean}
|
||||||
*/
|
*/
|
||||||
public static DynaBean create(Object bean) {
|
public static DynaBean create(Object bean) {
|
||||||
return new DynaBean(bean);
|
return new DynaBean(bean);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 创建一个{@link DynaBean}
|
* 创建一个{@link DynaBean}
|
||||||
*
|
*
|
||||||
* @param beanClass Bean类
|
* @param beanClass Bean类
|
||||||
* @param params 构造Bean所需要的参数
|
* @return {@link DynaBean}
|
||||||
* @return {@link DynaBean}
|
*/
|
||||||
*/
|
public static DynaBean create(Class<?> beanClass) {
|
||||||
public static DynaBean create(Class<?> beanClass, Object... params) {
|
return new DynaBean(beanClass);
|
||||||
return new DynaBean(beanClass, params);
|
}
|
||||||
}
|
|
||||||
|
|
||||||
//------------------------------------------------------------------------ Constructor start
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 构造
|
* 创建一个{@link DynaBean}
|
||||||
*
|
*
|
||||||
* @param beanClass Bean类
|
* @param beanClass Bean类
|
||||||
* @param params 构造Bean所需要的参数
|
* @param params 构造Bean所需要的参数
|
||||||
*/
|
* @return {@link DynaBean}
|
||||||
public DynaBean(Class<?> beanClass, Object... params) {
|
*/
|
||||||
this(ReflectUtil.newInstance(beanClass, params));
|
public static DynaBean create(Class<?> beanClass, Object... params) {
|
||||||
}
|
return new DynaBean(beanClass, params);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
//------------------------------------------------------------------------ Constructor start
|
||||||
* 构造
|
|
||||||
*
|
|
||||||
* @param bean 原始Bean
|
|
||||||
*/
|
|
||||||
public DynaBean(Object bean) {
|
|
||||||
Assert.notNull(bean);
|
|
||||||
if (bean instanceof DynaBean) {
|
|
||||||
bean = ((DynaBean) bean).getBean();
|
|
||||||
}
|
|
||||||
this.bean = bean;
|
|
||||||
this.beanClass = ClassUtil.getClass(bean);
|
|
||||||
}
|
|
||||||
//------------------------------------------------------------------------ Constructor end
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获得字段对应值
|
* 构造
|
||||||
*
|
*
|
||||||
* @param <T> 属性值类型
|
* @param beanClass Bean类
|
||||||
* @param fieldName 字段名
|
* @param params 构造Bean所需要的参数
|
||||||
* @return 字段值
|
*/
|
||||||
* @throws BeanException 反射获取属性值或字段值导致的异常
|
public DynaBean(Class<?> beanClass, Object... params) {
|
||||||
*/
|
this(ReflectUtil.newInstance(beanClass, params));
|
||||||
@SuppressWarnings("unchecked")
|
}
|
||||||
public <T> T get(String fieldName) throws BeanException {
|
|
||||||
if (Map.class.isAssignableFrom(beanClass)) {
|
|
||||||
return (T) ((Map<?, ?>) bean).get(fieldName);
|
|
||||||
} else {
|
|
||||||
final PropDesc prop = BeanUtil.getBeanDesc(beanClass).getProp(fieldName);
|
|
||||||
if(null == prop){
|
|
||||||
throw new BeanException("No public field or get method for {}", fieldName);
|
|
||||||
}
|
|
||||||
return (T) prop.getValue(bean);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 检查是否有指定名称的bean属性
|
* 构造
|
||||||
*
|
*
|
||||||
* @param fieldName 字段名
|
* @param beanClass Bean类
|
||||||
* @return 是否有bean属性
|
*/
|
||||||
* @since 5.4.2
|
public DynaBean(Class<?> beanClass) {
|
||||||
*/
|
this(ReflectUtil.newInstance(beanClass));
|
||||||
public boolean containsProp(String fieldName){
|
}
|
||||||
return null != BeanUtil.getBeanDesc(beanClass).getProp(fieldName);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获得字段对应值，获取异常返回{@code null}
|
* 构造
|
||||||
*
|
*
|
||||||
* @param <T> 属性值类型
|
* @param bean 原始Bean
|
||||||
* @param fieldName 字段名
|
*/
|
||||||
* @return 字段值
|
public DynaBean(Object bean) {
|
||||||
* @since 3.1.1
|
Assert.notNull(bean);
|
||||||
*/
|
if (bean instanceof DynaBean) {
|
||||||
public <T> T safeGet(String fieldName) {
|
bean = ((DynaBean) bean).getBean();
|
||||||
try {
|
}
|
||||||
return get(fieldName);
|
this.bean = bean;
|
||||||
} catch (Exception e) {
|
this.beanClass = ClassUtil.getClass(bean);
|
||||||
return null;
|
}
|
||||||
}
|
//------------------------------------------------------------------------ Constructor end
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 设置字段值
|
* 获得字段对应值
|
||||||
*
|
*
|
||||||
* @param fieldName 字段名
|
* @param <T> 属性值类型
|
||||||
* @param value 字段值
|
* @param fieldName 字段名
|
||||||
* @throws BeanException 反射获取属性值或字段值导致的异常
|
* @return 字段值
|
||||||
*/
|
* @throws BeanException 反射获取属性值或字段值导致的异常
|
||||||
@SuppressWarnings({"unchecked", "rawtypes"})
|
*/
|
||||||
public void set(String fieldName, Object value) throws BeanException {
|
@SuppressWarnings("unchecked")
|
||||||
if (Map.class.isAssignableFrom(beanClass)) {
|
public <T> T get(String fieldName) throws BeanException {
|
||||||
((Map) bean).put(fieldName, value);
|
if (Map.class.isAssignableFrom(beanClass)) {
|
||||||
} else {
|
return (T) ((Map<?, ?>) bean).get(fieldName);
|
||||||
final PropDesc prop = BeanUtil.getBeanDesc(beanClass).getProp(fieldName);
|
} else {
|
||||||
if(null == prop){
|
final PropDesc prop = BeanUtil.getBeanDesc(beanClass).getProp(fieldName);
|
||||||
throw new BeanException("No public field or set method for {}", fieldName);
|
if (null == prop) {
|
||||||
}
|
throw new BeanException("No public field or get method for {}", fieldName);
|
||||||
prop.setValue(bean, value);
|
}
|
||||||
}
|
return (T) prop.getValue(bean);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 执行原始Bean中的方法
|
* 检查是否有指定名称的bean属性
|
||||||
*
|
*
|
||||||
* @param methodName 方法名
|
* @param fieldName 字段名
|
||||||
* @param params 参数
|
* @return 是否有bean属性
|
||||||
* @return 执行结果，可能为null
|
* @since 5.4.2
|
||||||
*/
|
*/
|
||||||
public Object invoke(String methodName, Object... params) {
|
public boolean containsProp(String fieldName) {
|
||||||
return ReflectUtil.invoke(this.bean, methodName, params);
|
return null != BeanUtil.getBeanDesc(beanClass).getProp(fieldName);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获得原始Bean
|
* 获得字段对应值，获取异常返回{@code null}
|
||||||
*
|
*
|
||||||
* @param <T> Bean类型
|
* @param <T> 属性值类型
|
||||||
* @return bean
|
* @param fieldName 字段名
|
||||||
*/
|
* @return 字段值
|
||||||
@SuppressWarnings("unchecked")
|
* @since 3.1.1
|
||||||
public <T> T getBean() {
|
*/
|
||||||
return (T) this.bean;
|
public <T> T safeGet(String fieldName) {
|
||||||
}
|
try {
|
||||||
|
return get(fieldName);
|
||||||
|
} catch (Exception e) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获得Bean的类型
|
* 设置字段值
|
||||||
*
|
*
|
||||||
* @param <T> Bean类型
|
* @param fieldName 字段名
|
||||||
* @return Bean类型
|
* @param value 字段值
|
||||||
*/
|
* @throws BeanException 反射获取属性值或字段值导致的异常
|
||||||
@SuppressWarnings("unchecked")
|
*/
|
||||||
public <T> Class<T> getBeanClass() {
|
@SuppressWarnings({"unchecked", "rawtypes"})
|
||||||
return (Class<T>) this.beanClass;
|
public void set(String fieldName, Object value) throws BeanException {
|
||||||
}
|
if (Map.class.isAssignableFrom(beanClass)) {
|
||||||
|
((Map) bean).put(fieldName, value);
|
||||||
|
} else {
|
||||||
|
final PropDesc prop = BeanUtil.getBeanDesc(beanClass).getProp(fieldName);
|
||||||
|
if (null == prop) {
|
||||||
|
throw new BeanException("No public field or set method for {}", fieldName);
|
||||||
|
}
|
||||||
|
prop.setValue(bean, value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
/**
|
||||||
public int hashCode() {
|
* 执行原始Bean中的方法
|
||||||
final int prime = 31;
|
*
|
||||||
int result = 1;
|
* @param methodName 方法名
|
||||||
result = prime * result + ((bean == null) ? 0 : bean.hashCode());
|
* @param params 参数
|
||||||
return result;
|
* @return 执行结果，可能为null
|
||||||
}
|
*/
|
||||||
|
public Object invoke(String methodName, Object... params) {
|
||||||
|
return ReflectUtil.invoke(this.bean, methodName, params);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
/**
|
||||||
public boolean equals(Object obj) {
|
* 获得原始Bean
|
||||||
if (this == obj) {
|
*
|
||||||
return true;
|
* @param <T> Bean类型
|
||||||
}
|
* @return bean
|
||||||
if (obj == null) {
|
*/
|
||||||
return false;
|
@SuppressWarnings("unchecked")
|
||||||
}
|
public <T> T getBean() {
|
||||||
if (getClass() != obj.getClass()) {
|
return (T) this.bean;
|
||||||
return false;
|
}
|
||||||
}
|
|
||||||
final DynaBean other = (DynaBean) obj;
|
|
||||||
if (bean == null) {
|
|
||||||
return other.bean == null;
|
|
||||||
} else return bean.equals(other.bean);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
/**
|
||||||
public String toString() {
|
* 获得Bean的类型
|
||||||
return this.bean.toString();
|
*
|
||||||
}
|
* @param <T> Bean类型
|
||||||
|
* @return Bean类型
|
||||||
|
*/
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
public <T> Class<T> getBeanClass() {
|
||||||
|
return (Class<T>) this.beanClass;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int hashCode() {
|
||||||
|
final int prime = 31;
|
||||||
|
int result = 1;
|
||||||
|
result = prime * result + ((bean == null) ? 0 : bean.hashCode());
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object obj) {
|
||||||
|
if (this == obj) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (obj == null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (getClass() != obj.getClass()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
final DynaBean other = (DynaBean) obj;
|
||||||
|
if (bean == null) {
|
||||||
|
return other.bean == null;
|
||||||
|
} else return bean.equals(other.bean);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return this.bean.toString();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -33,6 +33,56 @@ public class DynaBeanTest {
|
|||||||
Object invoke = bean2.invoke("testMethod");
|
Object invoke = bean2.invoke("testMethod");
|
||||||
Assert.assertEquals("test for 李华", invoke);
|
Assert.assertEquals("test for 李华", invoke);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void bean_by_static_clazz_constructor_Test() {
|
||||||
|
String name_before = "李华";
|
||||||
|
int age_before = 12;
|
||||||
|
DynaBean bean = DynaBean.create(User.class);
|
||||||
|
bean.set("name", name_before);
|
||||||
|
bean.set("age", age_before);
|
||||||
|
|
||||||
|
String name_after = bean.get("name");
|
||||||
|
Assert.assertEquals(name_before, name_after);
|
||||||
|
int age_after = bean.get("age");
|
||||||
|
Assert.assertEquals(age_before, age_after);
|
||||||
|
|
||||||
|
//重复包装测试
|
||||||
|
DynaBean bean2 = new DynaBean(bean);
|
||||||
|
User user2 = bean2.getBean();
|
||||||
|
User user1 = bean.getBean();
|
||||||
|
Assert.assertEquals(user1, user2);
|
||||||
|
|
||||||
|
//执行指定方法
|
||||||
|
Object invoke = bean2.invoke("testMethod");
|
||||||
|
Assert.assertEquals("test for 李华", invoke);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void bean_by_instance_clazz_constructor_Test() {
|
||||||
|
String name_before = "李华";
|
||||||
|
int age_before = 12;
|
||||||
|
DynaBean bean = new DynaBean(User.class);
|
||||||
|
bean.set("name", name_before);
|
||||||
|
bean.set("age", age_before);
|
||||||
|
|
||||||
|
String name_after = bean.get("name");
|
||||||
|
Assert.assertEquals(name_before, name_after);
|
||||||
|
int age_after = bean.get("age");
|
||||||
|
Assert.assertEquals(age_before, age_after);
|
||||||
|
|
||||||
|
//重复包装测试
|
||||||
|
DynaBean bean2 = new DynaBean(bean);
|
||||||
|
User user2 = bean2.getBean();
|
||||||
|
User user1 = bean.getBean();
|
||||||
|
Assert.assertEquals(user1, user2);
|
||||||
|
|
||||||
|
//执行指定方法
|
||||||
|
Object invoke = bean2.invoke("testMethod");
|
||||||
|
Assert.assertEquals("test for 李华", invoke);
|
||||||
|
}
|
||||||
|
|
||||||
public static class User{
|
public static class User{
|
||||||
private String name;
|
private String name;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user