From ff8b9f47ca922e4e2d2f087e4859242d261a2cd6 Mon Sep 17 00:00:00 2001 From: Looly Date: Mon, 5 Sep 2022 10:33:39 +0800 Subject: [PATCH] fix code --- .../src/main/java/cn/hutool/json/InternalJSONUtil.java | 2 +- hutool-json/src/main/java/cn/hutool/json/JSON.java | 10 +++++++++- .../src/main/java/cn/hutool/json/JSONArray.java | 6 ------ .../src/main/java/cn/hutool/json/JSONObject.java | 6 ------ 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/hutool-json/src/main/java/cn/hutool/json/InternalJSONUtil.java b/hutool-json/src/main/java/cn/hutool/json/InternalJSONUtil.java index 4d092cefa..0f3ce637f 100755 --- a/hutool-json/src/main/java/cn/hutool/json/InternalJSONUtil.java +++ b/hutool-json/src/main/java/cn/hutool/json/InternalJSONUtil.java @@ -199,7 +199,7 @@ public final class InternalJSONUtil { * @return Map */ static Map createRawMap(int capacity, JSONConfig config) { - Map rawHashMap; + final Map rawHashMap; if (null == config) { config = JSONConfig.create(); } diff --git a/hutool-json/src/main/java/cn/hutool/json/JSON.java b/hutool-json/src/main/java/cn/hutool/json/JSON.java index 4b71cd003..135049e0a 100755 --- a/hutool-json/src/main/java/cn/hutool/json/JSON.java +++ b/hutool-json/src/main/java/cn/hutool/json/JSON.java @@ -15,6 +15,14 @@ import java.lang.reflect.Type; */ public interface JSON extends Cloneable, Serializable { + /** + * 获取JSON配置 + * + * @return {@link JSONConfig} + * @since 5.8.6 + */ + JSONConfig getConfig(); + /** * 通过表达式获取JSON中嵌套的对象
*
    @@ -169,7 +177,7 @@ public interface JSON extends Cloneable, Serializable { * @since 3.0.8 */ default T toBean(Type type) { - return toBean(type, false); + return toBean(type, getConfig().isIgnoreError()); } /** diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONArray.java b/hutool-json/src/main/java/cn/hutool/json/JSONArray.java index 4923e90ce..881deba19 100755 --- a/hutool-json/src/main/java/cn/hutool/json/JSONArray.java +++ b/hutool-json/src/main/java/cn/hutool/json/JSONArray.java @@ -12,7 +12,6 @@ import cn.hutool.json.serialize.JSONWriter; import java.io.StringWriter; import java.io.Writer; -import java.lang.reflect.Type; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; @@ -262,11 +261,6 @@ public class JSONArray implements JSON, JSONGetter, List, Rando return this; } - @Override - public T toBean(Type type) { - return JSON.super.toBean(type, config.isIgnoreError()); - } - /** * 根据给定名列表,与其位置对应的值组成JSONObject * diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONObject.java b/hutool-json/src/main/java/cn/hutool/json/JSONObject.java index 321da8ea6..306ef61f8 100755 --- a/hutool-json/src/main/java/cn/hutool/json/JSONObject.java +++ b/hutool-json/src/main/java/cn/hutool/json/JSONObject.java @@ -14,7 +14,6 @@ import cn.hutool.json.serialize.JSONWriter; import java.io.StringWriter; import java.io.Writer; -import java.lang.reflect.Type; import java.math.BigDecimal; import java.math.BigInteger; import java.util.Collection; @@ -284,11 +283,6 @@ public class JSONObject extends MapWrapper implements JSON, JSON return this; } - @Override - public T toBean(Type type) { - return JSON.super.toBean(type, this.config.isIgnoreError()); - } - /** * 将指定KEY列表的值组成新的JSONArray *