clazz, final String fieldName) {
- return LambdaFactory.build(Function.class, BeanUtil.getBeanDesc(clazz).getGetter(fieldName));
+ final MethodInvoker getter = (MethodInvoker) BeanUtil.getBeanDesc(clazz).getGetter(fieldName);
+ return buildGetter(getter.getMethod());
}
/**
@@ -205,9 +206,9 @@ public class LambdaUtil {
* @param setter方法返回的值类型
* @return Obj::setXxx
*/
- @SuppressWarnings("unchecked")
public static BiConsumer buildSetter(final Class clazz, final String fieldName) {
- return LambdaFactory.build(BiConsumer.class, BeanUtil.getBeanDesc(clazz).getSetter(fieldName));
+ final MethodInvoker setter = (MethodInvoker) BeanUtil.getBeanDesc(clazz).getSetter(fieldName);
+ return buildSetter(setter.getMethod());
}
/**
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/Opt.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/Opt.java
index 79e6dab7b..d20d11aa3 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/Opt.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/Opt.java
@@ -163,6 +163,19 @@ public class Opt {
return this.value;
}
+ /**
+ * 返回包裹里的元素，取不到则抛出异常
+ *
+ * @return 包裹里的元素
+ * @throws NoSuchElementException 如果元素为空，则抛出此异常
+ */
+ public T getOrThrow() throws NoSuchElementException {
+ if (this.value == null) {
+ throw new NoSuchElementException("No value present");
+ }
+ return this.value;
+ }
+
/**
* 判断包裹里元素的值是否不存在，不存在为 {@code true}，否则为{@code false}
*
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/FieldInvoker.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/FieldInvoker.java
index 1dc054308..d92eed07b 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/FieldInvoker.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/FieldInvoker.java
@@ -22,6 +22,7 @@ import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.lang.Assert;
import java.lang.reflect.Field;
+import java.lang.reflect.Type;
/**
* 字段调用器
@@ -30,7 +31,7 @@ import java.lang.reflect.Field;
* {@code
* FieldInvoker.of(Field).invoke(obj);
* }
- *
+ *
* 赋值字段值：
*
{@code
* FieldInvoker.of(Field).invoke(obj, value);
@@ -60,7 +61,32 @@ public class FieldInvoker implements Invoker {
* @param field 字段
*/
public FieldInvoker(final Field field) {
- this.field = Assert.notNull(field);;
+ this.field = Assert.notNull(field);
+ ;
+ }
+
+ /**
+ * 获取字段
+ *
+ * @return 字段
+ */
+ public Field getField() {
+ return this.field;
+ }
+
+ @Override
+ public String getName() {
+ return this.field.getName();
+ }
+
+ @Override
+ public Type getType() {
+ return field.getGenericType();
+ }
+
+ @Override
+ public Class getTypeClass() {
+ return field.getType();
}
/**
@@ -77,10 +103,10 @@ public class FieldInvoker implements Invoker {
@SuppressWarnings("unchecked")
@Override
public T invoke(final Object target, final Object... args) {
- if(ArrayUtil.isEmpty(args)){
+ if (ArrayUtil.isEmpty(args)) {
// 默认取值
return (T) invokeGet(target);
- } else if(args.length == 1){
+ } else if (args.length == 1) {
invokeSet(target, args[0]);
return null;
}
@@ -91,7 +117,7 @@ public class FieldInvoker implements Invoker {
/**
* 获取字段值
*
- * @param obj 对象，static字段则此字段为null
+ * @param obj 对象，static字段则此字段为null
* @return 字段值
* @throws HutoolException 包装IllegalAccessException异常
*/
@@ -130,19 +156,14 @@ public class FieldInvoker implements Invoker {
}
}
- @Override
- public Class getType() {
- return field.getType();
- }
-
/**
* 转换值类型
*
* @param value 值
* @return 转换后的值
*/
- private Object convertValue(final Object value){
- if(null == converter){
+ private Object convertValue(final Object value) {
+ if (null == converter) {
return value;
}
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/Invoker.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/Invoker.java
index 6555dfa3c..a7026adeb 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/Invoker.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/Invoker.java
@@ -16,6 +16,8 @@
package org.dromara.hutool.core.reflect;
+import java.lang.reflect.Type;
+
/**
* Invoker接口定义了调用目标对象的方法的规范。
* 它允许动态地调用方法，增强了代码的灵活性和扩展性。
@@ -36,10 +38,24 @@ public interface Invoker {
T invoke(Object target, Object... args);
/**
- * 获取调用方法的返回类型或参数类型。
+ * 获取调用方法的名称。
+ *
+ * @return 调用方法的名称，作为字符串返回。
+ */
+ String getName();
+
+ /**
+ * 获取调用方法的返回类型或参数类型或字段类型。
*
* @return 调用方法的返回类型，作为Class对象返回。
*/
- Class getType();
+ Type getType();
+
+ /**
+ * 获取调用方法的返回类型或参数类型或字段类型。
+ *
+ * @return 调用方法的返回类型，作为Class对象返回。
+ */
+ Class getTypeClass();
}
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/TypeUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/TypeUtil.java
index dbbf5507a..9f4dc551d 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/TypeUtil.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/TypeUtil.java
@@ -20,12 +20,7 @@ import org.dromara.hutool.core.array.ArrayUtil;
import org.dromara.hutool.core.collection.ListUtil;
import org.dromara.hutool.core.util.ObjUtil;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.lang.reflect.TypeVariable;
-import java.lang.reflect.WildcardType;
+import java.lang.reflect.*;
import java.util.List;
import java.util.Map;
@@ -66,6 +61,8 @@ public class TypeUtil {
if (upperBounds.length == 1) {
return getClass(upperBounds[0]);
}
+ } else if(type instanceof GenericArrayType){
+ return Array.newInstance(getClass(((GenericArrayType)type).getGenericComponentType()), 0).getClass();
}
}
return null;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/method/MethodInvoker.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/method/MethodInvoker.java
index 8df36673d..9b6684843 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/method/MethodInvoker.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/method/MethodInvoker.java
@@ -18,12 +18,11 @@ package org.dromara.hutool.core.reflect.method;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.lang.Assert;
-import org.dromara.hutool.core.reflect.ClassUtil;
-import org.dromara.hutool.core.reflect.Invoker;
-import org.dromara.hutool.core.reflect.ModifierUtil;
+import org.dromara.hutool.core.reflect.*;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import java.lang.reflect.Type;
/**
* 方法调用器，通过反射调用方法。
@@ -43,8 +42,10 @@ public class MethodInvoker implements Invoker {
}
private final Method method;
- private final Class[] paramTypes;
- private final Class type;
+ private final Type[] paramTypes;
+ private final Class[] paramTypeClasses;
+ private final Type type;
+ private final Class typeClass;
private boolean checkArgs;
/**
@@ -53,17 +54,53 @@ public class MethodInvoker implements Invoker {
* @param method 方法
*/
public MethodInvoker(final Method method) {
- this.method = method;
+ this.method = ReflectUtil.setAccessible(Assert.notNull(method));
- this.paramTypes = method.getParameterTypes();
+ this.paramTypes = TypeUtil.getParamTypes(method);
+ this.paramTypeClasses = method.getParameterTypes();
if (paramTypes.length == 1) {
// setter方法读取参数类型
type = paramTypes[0];
+ typeClass = paramTypeClasses[0];
} else {
type = method.getReturnType();
+ typeClass = method.getReturnType();
}
}
+ /**
+ * 获取方法
+ *
+ * @return 方法
+ */
+ public Method getMethod() {
+ return this.method;
+ }
+
+ /**
+ * 获取方法参数类型
+ *
+ * @return 方法参数类型
+ */
+ public Type[] getParamTypes() {
+ return this.paramTypes;
+ }
+
+ @Override
+ public String getName() {
+ return this.method.getName();
+ }
+
+ @Override
+ public Type getType() {
+ return this.type;
+ }
+
+ @Override
+ public Class getTypeClass() {
+ return this.typeClass;
+ }
+
/**
* 设置是否检查参数
*
@@ -81,19 +118,21 @@ public class MethodInvoker implements Invoker {
@SuppressWarnings("unchecked")
@Override
- public T invoke(Object target, final Object... args) throws HutoolException{
- if(this.checkArgs){
+ public T invoke(Object target, final Object... args) throws HutoolException {
+ if (this.checkArgs) {
checkArgs(args);
}
final Method method = this.method;
// static方法调用则target为null
- if(ModifierUtil.isStatic(method)){
+ if (ModifierUtil.isStatic(method)) {
target = null;
}
// 根据方法定义的参数类型，将用户传入的参数规整和转换
final Object[] actualArgs = MethodUtil.actualArgs(method, args);
try {
+ // issue#3671 JDK15+ 修改了lambda的策略，动态生成后在metaspace不会释放，导致资源占用高
+ //return (T) LambdaUtil.buildGetter(method).apply(target);
return MethodHandleUtil.invokeExact(target, method, actualArgs);
} catch (final Exception e) {
// 传统反射方式执行方法
@@ -108,8 +147,8 @@ public class MethodInvoker implements Invoker {
/**
* 执行静态方法
*
- * @param 对象类型
- * @param args 参数对象
+ * @param 对象类型
+ * @param args 参数对象
* @return 结果
* @throws HutoolException 多种异常包装
*/
@@ -117,11 +156,6 @@ public class MethodInvoker implements Invoker {
return invoke(null, args);
}
- @Override
- public Class getType() {
- return this.type;
- }
-
/**
* 检查传入参数的有效性。
*
@@ -129,12 +163,12 @@ public class MethodInvoker implements Invoker {
* @throws IllegalArgumentException 如果参数数组为空或长度为0，则抛出此异常。
*/
private void checkArgs(final Object[] args) {
- final Class[] paramTypes = this.paramTypes;
+ final Class[] paramTypeClasses = this.paramTypeClasses;
if (null != args) {
- Assert.isTrue(args.length == paramTypes.length, "Params length [{}] is not fit for param length [{}] of method !", args.length, paramTypes.length);
+ Assert.isTrue(args.length == paramTypeClasses.length, "Params length [{}] is not fit for param length [{}] of method !", args.length, paramTypeClasses.length);
Class type;
for (int i = 0; i < args.length; i++) {
- type = paramTypes[i];
+ type = paramTypeClasses[i];
if (type.isPrimitive() && null == args[i]) {
// 参数是原始类型，而传入参数为null时赋予默认值
args[i] = ClassUtil.getDefaultValue(type);
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/util/BooleanUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/BooleanUtil.java
index 00c1277d9..2072cdb0f 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/util/BooleanUtil.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/BooleanUtil.java
@@ -20,6 +20,7 @@ import org.dromara.hutool.core.array.ArrayUtil;
import org.dromara.hutool.core.collection.set.SetUtil;
import org.dromara.hutool.core.text.StrUtil;
+import java.lang.reflect.Type;
import java.util.Set;
/**
@@ -532,11 +533,11 @@ public class BooleanUtil {
/**
* 给定类是否为Boolean或者boolean
*
- * @param clazz 类
+ * @param type 类
* @return 是否为Boolean或者boolean
* @since 4.5.2
*/
- public static boolean isBoolean(final Class clazz) {
- return (clazz == Boolean.class || clazz == boolean.class);
+ public static boolean isBoolean(final Type type) {
+ return (type == Boolean.class || type == boolean.class);
}
}
diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanDescTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanDescTest.java
index 3a824e3ae..e1b18b614 100644
--- a/hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanDescTest.java
+++ b/hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanDescTest.java
@@ -17,9 +17,12 @@
package org.dromara.hutool.core.bean;
import org.dromara.hutool.core.bean.path.AbstractBeanDesc;
+import org.dromara.hutool.core.reflect.method.MethodInvoker;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
+import java.lang.reflect.Method;
+
/**
* {@link StrictBeanDesc} 单元测试类
*
@@ -38,8 +41,10 @@ public class BeanDescTest {
Assertions.assertEquals("age", desc.getProp("age").getFieldName());
Assertions.assertEquals("getAge", desc.getGetter("age").getName());
Assertions.assertEquals("setAge", desc.getSetter("age").getName());
- Assertions.assertEquals(1, desc.getSetter("age").getParameterTypes().length);
- Assertions.assertSame(int.class, desc.getSetter("age").getParameterTypes()[0]);
+
+ final MethodInvoker setter = (MethodInvoker) desc.getSetter("age");
+ Assertions.assertEquals(1, setter.getMethod().getParameterTypes().length);
+ Assertions.assertSame(int.class, setter.getMethod().getParameterTypes()[0]);
}
@@ -51,8 +56,11 @@ public class BeanDescTest {
Assertions.assertEquals("name", prop.getFieldName());
Assertions.assertEquals("getName", prop.getGetter().getName());
Assertions.assertEquals("setName", prop.getSetter().getName());
- Assertions.assertEquals(1, prop.getSetter().getParameterTypes().length);
- Assertions.assertSame(String.class, prop.getSetter().getParameterTypes()[0]);
+
+ final MethodInvoker setter = (MethodInvoker) desc.getSetter("name");
+ final Method setterMethod = setter.getMethod();
+ Assertions.assertEquals(1, setterMethod.getParameterTypes().length);
+ Assertions.assertSame(String.class, setterMethod.getParameterTypes()[0]);
}
@Test
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/handler/row/BeanRowHandler.java b/hutool-db/src/main/java/org/dromara/hutool/db/handler/row/BeanRowHandler.java
index c35c13995..2b07f2aeb 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/handler/row/BeanRowHandler.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/handler/row/BeanRowHandler.java
@@ -19,12 +19,11 @@ package org.dromara.hutool.db.handler.row;
import org.dromara.hutool.core.bean.BeanUtil;
import org.dromara.hutool.core.bean.PropDesc;
import org.dromara.hutool.core.reflect.ConstructorUtil;
-import org.dromara.hutool.core.reflect.TypeUtil;
-import org.dromara.hutool.core.reflect.method.MethodUtil;
+import org.dromara.hutool.core.reflect.Invoker;
+import org.dromara.hutool.core.reflect.method.MethodInvoker;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.db.handler.ResultSetUtil;
-import java.lang.reflect.Method;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
@@ -63,7 +62,7 @@ public class BeanRowHandler extends AbsRowHandler {
final Map propMap = BeanUtil.getBeanDesc(beanType).getPropMap(this.caseInsensitive);
String columnLabel;
PropDesc pd;
- Method setter;
+ Invoker setter;
Object value;
for (int i = 1; i <= columnCount; i++) {
columnLabel = meta.getColumnLabel(i);
@@ -74,8 +73,12 @@ public class BeanRowHandler extends AbsRowHandler {
}
setter = (null == pd) ? null : pd.getSetter();
if (null != setter) {
- value = ResultSetUtil.getColumnValue(rs, i, meta.getColumnType(i), TypeUtil.getFirstParamType(setter));
- MethodUtil.invokeWithCheck(bean, setter, value);
+ value = ResultSetUtil.getColumnValue(rs, i, meta.getColumnType(i), setter.getType());
+ if(setter instanceof MethodInvoker){
+ MethodInvoker.of(((MethodInvoker) setter).getMethod()).setCheckArgs(true).invoke(bean, value);
+ }else {
+ setter.invoke(bean, value);
+ }
}
}
return bean;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/JSON.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSON.java
index 652ff2dd6..71cd5eda9 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/JSON.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSON.java
@@ -20,6 +20,7 @@ import org.dromara.hutool.core.bean.path.BeanPath;
import org.dromara.hutool.core.convert.ConvertException;
import org.dromara.hutool.core.convert.Converter;
import org.dromara.hutool.core.lang.mutable.MutableEntry;
+import org.dromara.hutool.core.util.ObjUtil;
import java.io.Serializable;
import java.io.StringWriter;
@@ -43,7 +44,7 @@ public interface JSON extends Converter, Cloneable, Serializable {
JSONConfig config();
/**
- * JSON大小，对于JSONObject，是键值对的多少，JSONArray则是元素的个数
+ * JSON大小，对于JSONObject，是键值对的多少，JSONArray则是元素的个数，JSON原始数据为1
*
* @return 大小
*/
@@ -192,6 +193,6 @@ public interface JSON extends Converter, Cloneable, Serializable {
@Override
default Object convert(final Type targetType, final Object value) throws ConvertException {
- return config().getConverter().convert(targetType, value);
+ return ObjUtil.defaultIfNull(config(), JSONConfig::of).getConverter().convert(targetType, value);
}
}
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/JSONPrimitive.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSONPrimitive.java
new file mode 100644
index 000000000..d48ac7a1c
--- /dev/null
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSONPrimitive.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2024 Hutool Team and hutool.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.dromara.hutool.json;
+
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.lang.mutable.MutableEntry;
+import org.dromara.hutool.json.writer.GlobalValueWriters;
+import org.dromara.hutool.json.writer.JSONValueWriter;
+import org.dromara.hutool.json.writer.JSONWriter;
+
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.function.Predicate;
+
+/**
+ * JSON原始类型数据封装，根据RFC8259规范，JSONPrimitive只包含以下类型：
+ *
+ * - number
+ * - string
+ * - null
+ *
+ *
+ * @author Looly
+ * @since 6.0.0
+ */
+public class JSONPrimitive implements JSON {
+ private static final long serialVersionUID = -2026215279191790345L;
+
+ private Object value;
+ /**
+ * 配置项
+ */
+ private JSONConfig config;
+
+ /**
+ * 构造
+ *
+ * @param value 值
+ */
+ public JSONPrimitive(final Object value) {
+ this(value, null);
+ }
+
+ /**
+ * 构造
+ *
+ * @param value 值
+ * @param config 配置项
+ */
+ public JSONPrimitive(final Object value, final JSONConfig config) {
+ this.value = Assert.notNull(value);
+ this.config = config;
+ }
+
+ /**
+ * 获取值
+ *
+ * @return 值
+ */
+ public Object getValue() {
+ return this.value;
+ }
+
+ /**
+ * 设置值
+ *
+ * @param value 值
+ * @return this
+ */
+ public JSONPrimitive setValue(final Object value) {
+ this.value = value;
+ return this;
+ }
+
+ @Override
+ public JSONConfig config() {
+ return this.config;
+ }
+
+ /**
+ * 设置配置项
+ *
+ * @param config 配置项
+ * @return this
+ */
+ JSONPrimitive setConfig(final JSONConfig config) {
+ this.config = config;
+ return this;
+ }
+
+ @Override
+ public int size() {
+ return 1;
+ }
+
+ @Override
+ public Writer write(final Writer writer, final int indentFactor, final int indent, final Predicate> predicate) throws JSONException {
+ final Object value = this.value;
+ final JSONWriter jsonWriter = JSONWriter.of(writer, indentFactor, indent, config);
+
+ // 自定义规则
+ final JSONValueWriter valueWriter = GlobalValueWriters.get(value);
+ if (null != valueWriter) {
+ valueWriter.write(jsonWriter, value);
+ return writer;
+ }
+
+ // 默认包装字符串
+ jsonWriter.writeQuoteStrValue(value.toString());
+ return writer;
+ }
+
+ @Override
+ public String toString() {
+ final StringWriter sw = new StringWriter();
+ return this.write(sw, 0, 0, null).toString();
+ }
+}
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/JSONUtil.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSONUtil.java
index 6a456475a..63a8ca4a5 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/JSONUtil.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSONUtil.java
@@ -16,7 +16,6 @@
package org.dromara.hutool.json;
-import org.dromara.hutool.core.convert.ConvertUtil;
import org.dromara.hutool.core.io.IORuntimeException;
import org.dromara.hutool.core.io.file.FileUtil;
import org.dromara.hutool.core.lang.Assert;
@@ -161,7 +160,7 @@ public class JSONUtil {
* @param obj 对象
* @return JSON
*/
- public static Object parse(final Object obj) {
+ public static JSON parse(final Object obj) {
return parse(obj, null);
}
@@ -178,7 +177,7 @@ public class JSONUtil {
* @param config JSON配置，{@code null}使用默认配置
* @return JSON（JSONObject or JSONArray）
*/
- public static Object parse(final Object obj, final JSONConfig config) {
+ public static JSON parse(final Object obj, final JSONConfig config) {
if (null == config) {
return JSONConverter.INSTANCE.toJSON(obj);
}
@@ -378,26 +377,21 @@ public class JSONUtil {
* 转为实体类对象
*
* @param Bean类型
- * @param json JSONObject
+ * @param obj JSONObject
* @param config JSON配置
* @param type 实体类对象类型
* @return 实体类对象
* @since 4.3.2
*/
- public static T toBean(Object json, final JSONConfig config, Type type) {
- if (null == json) {
+ public static T toBean(final Object obj, final JSONConfig config, Type type) {
+ if (null == obj) {
return null;
}
- json = parse(json, config);
- if (json instanceof JSON) {
- if (type instanceof TypeReference) {
- type = ((TypeReference) type).getType();
- }
- return ((JSON) json).toBean(type);
+ final JSON json = parse(obj, config);
+ if (type instanceof TypeReference) {
+ type = ((TypeReference) type).getType();
}
-
- //issue#I7CW27，其他类型使用默认转换
- return ConvertUtil.convert(type, json);
+ return json.toBean(type);
}
// -------------------------------------------------------------------- toBean end
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/convert/JSONConverter.java b/hutool-json/src/main/java/org/dromara/hutool/json/convert/JSONConverter.java
index 7456b2074..b29cc5ff4 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/convert/JSONConverter.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/convert/JSONConverter.java
@@ -29,7 +29,6 @@ import org.dromara.hutool.core.reflect.TypeReference;
import org.dromara.hutool.core.reflect.TypeUtil;
import org.dromara.hutool.core.reflect.kotlin.KClassUtil;
import org.dromara.hutool.core.text.StrUtil;
-import org.dromara.hutool.core.util.ObjUtil;
import org.dromara.hutool.json.*;
import org.dromara.hutool.json.serialize.JSONDeserializer;
import org.dromara.hutool.json.serialize.JSONStringer;
@@ -63,6 +62,7 @@ public class JSONConverter implements Converter, Serializable {
final RegisterConverter converter = RegisterConverter.getInstance();
converter.register(JSONObject.class, INSTANCE);
converter.register(JSONArray.class, INSTANCE);
+ converter.register(JSONPrimitive.class, INSTANCE);
}
/**
@@ -137,7 +137,7 @@ public class JSONConverter implements Converter, Serializable {
* @return 转换后的对象
* @throws JSONException 转换异常
*/
- public Object toJSON(Object obj) throws JSONException {
+ public JSON toJSON(Object obj) throws JSONException {
if (null == obj) {
return null;
}
@@ -148,10 +148,17 @@ public class JSONConverter implements Converter, Serializable {
obj = ((Opt) obj).getOrNull();
}
+ if(obj instanceof JSON){
+ return (JSON) obj;
+ }
+
+ if (obj instanceof Number || obj instanceof Boolean) {
+ // RFC8259规范的原始类型数据
+ return new JSONPrimitive(obj, config);
+ }
+
final JSON json;
- if (obj instanceof JSON || obj instanceof Number || obj instanceof Boolean) {
- return obj;
- } else if (obj instanceof CharSequence) {
+ if (obj instanceof CharSequence) {
return toJSON((CharSequence) obj);
} else if (obj instanceof MapWrapper) {
// MapWrapper实现了Iterable会被当作JSONArray，此处做修正
@@ -173,7 +180,7 @@ public class JSONConverter implements Converter, Serializable {
* @return 转换后的对象
* @throws JSONException 转换异常
*/
- public Object toJSON(final CharSequence str) throws JSONException {
+ public JSON toJSON(final CharSequence str) throws JSONException {
if (null == str) {
return null;
}
@@ -184,7 +191,7 @@ public class JSONConverter implements Converter, Serializable {
// 未被包装的空串理解为null
return null;
}
- final char firstC = jsonStr.charAt(0);
+
// RFC8259，JSON字符串值、number, boolean, or null
final JSONParser jsonParser = JSONParser.of(new JSONTokener(jsonStr), config);
final Object value = jsonParser.nextValue();
@@ -192,17 +199,10 @@ public class JSONConverter implements Converter, Serializable {
// 对于用户提供的未转义字符串导致解析未结束，报错
throw new JSONException("JSON format error: {}", jsonStr);
}
- switch (firstC) {
- case '"':
- case '\'':
- return InternalJSONUtil.quote((CharSequence) value);
- default:
- if (ObjUtil.equals(jsonStr, value)) {
- // 对于直接的字符串，如abc，按照字符串处理
- return InternalJSONUtil.quote((CharSequence) value);
- }
- return value;
+ if(null == value || value instanceof JSON){
+ return (JSON) value;
}
+ return new JSONPrimitive(value, config);
}
// ----------------------------------------------------------- Private method start
@@ -220,16 +220,16 @@ public class JSONConverter implements Converter, Serializable {
*/
@SuppressWarnings("unchecked")
private T toBean(final Type targetType, final JSON json) {
-
// 自定义对象反序列化
final JSONDeserializer