From 6394b41cb1fb1801c454d821861e35616e91634b Mon Sep 17 00:00:00 2001 From: Looly Date: Sun, 26 Mar 2023 09:01:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BD=93=E7=94=A8=E6=88=B7=E9=80=89=E6=8B=A9ig?= =?UTF-8?q?noreError=E6=97=B6=EF=BC=8C=E9=94=99=E8=AF=AF=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=E8=BD=ACJSON=E4=B9=9F=E5=BF=BD=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/hutool/json/ObjectMapper.java | 8 ++++++-- .../src/test/java/cn/hutool/json/JSONUtilTest.java | 10 ++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/hutool-json/src/main/java/cn/hutool/json/ObjectMapper.java b/hutool-json/src/main/java/cn/hutool/json/ObjectMapper.java index f44332caa..7248203ec 100755 --- a/hutool-json/src/main/java/cn/hutool/json/ObjectMapper.java +++ b/hutool-json/src/main/java/cn/hutool/json/ObjectMapper.java @@ -161,7 +161,7 @@ public class ObjectMapper { } else if (source instanceof JSONTokener) { mapFromTokener((JSONTokener) source, jsonArray, filter); } else { - Iterator iter; + final Iterator iter; if (ArrayUtil.isArray(source)) {// 数组 iter = new ArrayIter<>(source); } else if (source instanceof Iterator) {// Iterator @@ -169,7 +169,11 @@ public class ObjectMapper { } else if (source instanceof Iterable) {// Iterable iter = ((Iterable) source).iterator(); } else { - throw new JSONException("JSONArray initial value should be a string or collection or array."); + if(false == jsonArray.getConfig().isIgnoreError()){ + throw new JSONException("JSONArray initial value should be a string or collection or array."); + } + // 如果用户选择跳过异常，则跳过此值转换 + return; } final JSONConfig config = jsonArray.getConfig(); diff --git a/hutool-json/src/test/java/cn/hutool/json/JSONUtilTest.java b/hutool-json/src/test/java/cn/hutool/json/JSONUtilTest.java index 0816ff98d..be613315e 100644 --- a/hutool-json/src/test/java/cn/hutool/json/JSONUtilTest.java +++ b/hutool-json/src/test/java/cn/hutool/json/JSONUtilTest.java @@ -31,6 +31,16 @@ public class JSONUtilTest { Console.log(jsonArray); } + /** + * 数字解析为JSONArray报错 + */ + @Test + public void parseNumberToJSONArrayTest2() { + final JSONArray json = JSONUtil.parseArray(123L, + JSONConfig.create().setIgnoreError(true)); + Assert.assertNotNull(json); + } + /** * 数字解析为JSONArray报错 */