From 35feac4eaef1dd85feb0bd8878479fa8e5845210 Mon Sep 17 00:00:00 2001 From: Looly Date: Fri, 10 Mar 2023 13:07:05 +0800 Subject: [PATCH] fix code --- .../main/java/cn/hutool/core/io/FileUtil.java | 32 +--- .../cn/hutool/core/io/file/FileReader.java | 30 ++-- .../java/cn/hutool/core/util/XmlUtil.java | 11 +- .../core/lang/func/LambdaFactoryTest.java | 4 + .../java/cn/hutool/core/util/XmlUtilTest.java | 19 ++ .../main/java/cn/hutool/json/JSONNumber.java | 81 --------- .../main/java/cn/hutool/json/JSONString.java | 76 -------- .../main/java/cn/hutool/json/JSONUtil.java | 164 ++++++------------ .../cn/hutool/json/convert/JSONConverter.java | 14 +- .../java/cn/hutool/json/IssueI6LBZATest.java | 18 +- .../java/cn/hutool/json/JSONArrayTest.java | 3 +- .../java/cn/hutool/json/JSONPathTest.java | 2 +- .../java/cn/hutool/json/JSONUtilTest.java | 5 +- 13 files changed, 123 insertions(+), 336 deletions(-) delete mode 100755 hutool-json/src/main/java/cn/hutool/json/JSONNumber.java delete mode 100755 hutool-json/src/main/java/cn/hutool/json/JSONString.java diff --git a/hutool-core/src/main/java/cn/hutool/core/io/FileUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/FileUtil.java index 28a890ff5..d284e6a07 100755 --- a/hutool-core/src/main/java/cn/hutool/core/io/FileUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/FileUtil.java @@ -4,12 +4,12 @@ import cn.hutool.core.compress.ZipUtil; import cn.hutool.core.io.file.FileReader; import cn.hutool.core.io.file.*; import cn.hutool.core.io.file.FileWriter; -import cn.hutool.core.io.file.FileReader.ReaderHandler; import cn.hutool.core.io.resource.ResourceUtil; import cn.hutool.core.io.stream.BOMInputStream; import cn.hutool.core.io.unit.DataSizeUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.func.SerConsumer; +import cn.hutool.core.lang.func.SerFunction; import cn.hutool.core.net.url.URLUtil; import cn.hutool.core.reflect.ClassUtil; import cn.hutool.core.regex.ReUtil; @@ -1976,10 +1976,9 @@ public class FileUtil extends PathUtil { * @param path 文件的绝对路径 * @return 从文件中load出的数据 * @throws IORuntimeException IO异常 - * @since 3.1.1 */ - public static T loadUtf8(final String path, final ReaderHandler readerHandler) throws IORuntimeException { - return load(path, CharsetUtil.UTF_8, readerHandler); + public static T readUtf8(final String path, final SerFunction readerHandler) throws IORuntimeException { + return read(path, CharsetUtil.UTF_8, readerHandler); } /** @@ -1993,23 +1992,8 @@ public class FileUtil extends PathUtil { * @throws IORuntimeException IO异常 * @since 3.1.1 */ - public static T load(final String path, final String charset, final ReaderHandler readerHandler) throws IORuntimeException { - return FileReader.of(file(path), CharsetUtil.charset(charset)).read(readerHandler); - } - - /** - * 按照给定的readerHandler读取文件中的数据 - * - * @param 集合类型 - * @param readerHandler Reader处理类 - * @param path 文件的绝对路径 - * @param charset 字符集 - * @return 从文件中load出的数据 - * @throws IORuntimeException IO异常 - * @since 3.1.1 - */ - public static T load(final String path, final Charset charset, final ReaderHandler readerHandler) throws IORuntimeException { - return FileReader.of(file(path), charset).read(readerHandler); + public static T read(final String path, final Charset charset, final SerFunction readerHandler) throws IORuntimeException { + return read(file(path), charset, readerHandler); } /** @@ -2022,8 +2006,8 @@ public class FileUtil extends PathUtil { * @throws IORuntimeException IO异常 * @since 3.1.1 */ - public static T loadUtf8(final File file, final ReaderHandler readerHandler) throws IORuntimeException { - return load(file, CharsetUtil.UTF_8, readerHandler); + public static T readUtf8(final File file, final SerFunction readerHandler) throws IORuntimeException { + return read(file, CharsetUtil.UTF_8, readerHandler); } /** @@ -2037,7 +2021,7 @@ public class FileUtil extends PathUtil { * @throws IORuntimeException IO异常 * @since 3.1.1 */ - public static T load(final File file, final Charset charset, final ReaderHandler readerHandler) throws IORuntimeException { + public static T read(final File file, final Charset charset, final SerFunction readerHandler) throws IORuntimeException { return FileReader.of(file, charset).read(readerHandler); } diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/FileReader.java b/hutool-core/src/main/java/cn/hutool/core/io/file/FileReader.java index 0b73ad6a4..5590b81f7 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/FileReader.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/file/FileReader.java @@ -1,9 +1,11 @@ package cn.hutool.core.io.file; +import cn.hutool.core.exceptions.UtilException; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.io.IoUtil; import cn.hutool.core.lang.func.SerConsumer; +import cn.hutool.core.lang.func.SerFunction; import cn.hutool.core.text.StrUtil; import cn.hutool.core.util.CharsetUtil; @@ -17,6 +19,7 @@ import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.function.Function; /** * 文件读取器 @@ -207,14 +210,20 @@ public class FileReader extends FileWrapper { * @return 从文件中read出的数据 * @throws IORuntimeException IO异常 */ - public T read(final ReaderHandler readerHandler) throws IORuntimeException { + public T read(final SerFunction readerHandler) throws IORuntimeException { BufferedReader reader = null; T result; try { reader = FileUtil.getReader(this.file, charset); - result = readerHandler.handle(reader); - } catch (final IOException e) { - throw new IORuntimeException(e); + result = readerHandler.applying(reader); + } catch (final Exception e) { + if(e instanceof IOException){ + throw new IORuntimeException(e); + } else if(e instanceof RuntimeException){ + throw (RuntimeException)e; + } else{ + throw new UtilException(e); + } } finally { IoUtil.close(reader); } @@ -277,19 +286,6 @@ public class FileReader extends FileWrapper { } } - // -------------------------------------------------------------------------- Interface start - /** - * Reader处理接口 - * - * @author Luxiaolei - * - * @param Reader处理返回结果类型 - */ - public interface ReaderHandler { - T handle(BufferedReader reader) throws IOException; - } - // -------------------------------------------------------------------------- Interface end - /** * 检查文件 * diff --git a/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java index 42d56fb77..450f94688 100755 --- a/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java @@ -1,12 +1,14 @@ package cn.hutool.core.util; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.exceptions.UtilException; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.io.IoUtil; import cn.hutool.core.lang.Assert; +import cn.hutool.core.lang.Console; import cn.hutool.core.map.BiMap; import cn.hutool.core.map.MapUtil; import cn.hutool.core.text.StrUtil; @@ -181,7 +183,8 @@ public class XmlUtil { * @return XML文档对象 * @since 3.0.9 */ - public static Document readXML(final String pathOrContent) { + public static Document readXML(String pathOrContent) { + pathOrContent = StrUtil.trim(pathOrContent); if (StrUtil.startWith(pathOrContent, '<')) { return parseXml(pathOrContent); } @@ -985,11 +988,7 @@ public class XmlUtil { public static T xmlToBean(final Node node, final Class bean) { final Map map = xmlToMap(node); if (null != map && map.size() == 1) { - final String simpleName = bean.getSimpleName(); - if (map.containsKey(simpleName)) { - // 只有key和bean的名称匹配时才做单一对象转换 - return BeanUtil.toBean(map.get(simpleName), bean); - } + return BeanUtil.toBean(CollUtil.get(map.values(), 0), bean); } return BeanUtil.toBean(map, bean); } diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/func/LambdaFactoryTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/func/LambdaFactoryTest.java index 233153b44..83f65ee41 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/func/LambdaFactoryTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/lang/func/LambdaFactoryTest.java @@ -7,6 +7,7 @@ import lombok.Getter; import lombok.Setter; import lombok.SneakyThrows; import org.junit.Assert; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -71,6 +72,7 @@ public class LambdaFactoryTest { * @author nasodaengineer */ @RunWith(Parameterized.class) + @Ignore public static class PerformanceTest { @Parameterized.Parameter @@ -140,6 +142,7 @@ public class LambdaFactoryTest { @SuppressWarnings({"rawtypes", "unchecked", "Convert2MethodRef"}) @Test @SneakyThrows + @Ignore public void lambdaGetPerformanceTest() { final Something something = new Something(); something.setId(1L); @@ -216,6 +219,7 @@ public class LambdaFactoryTest { @SuppressWarnings({"rawtypes", "unchecked"}) @Test @SneakyThrows + @Ignore public void lambdaSetPerformanceTest() { final Something something = new Something(); something.setId(1L); diff --git a/hutool-core/src/test/java/cn/hutool/core/util/XmlUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/XmlUtilTest.java index f14e98859..595b457dd 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/XmlUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/util/XmlUtilTest.java @@ -348,4 +348,23 @@ public class XmlUtilTest { Console.log(XmlUtil.format(doc)); } + + @Test + public void xmlStrToBeanTest(){ + final String xml = "张三20zhangsan@example.com"; + final Document document = XmlUtil.readXML(xml); + final UserInfo userInfo = XmlUtil.xmlToBean(document, UserInfo.class); + Assert.assertEquals("张三", userInfo.getName()); + Assert.assertEquals("20", userInfo.getAge()); + Assert.assertEquals("zhangsan@example.com", userInfo.getEmail()); + } + + @Data + static class UserInfo { + + private String id; + private String name; + private String age; + private String email; + } } diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONNumber.java b/hutool-json/src/main/java/cn/hutool/json/JSONNumber.java deleted file mode 100755 index fd70a85c6..000000000 --- a/hutool-json/src/main/java/cn/hutool/json/JSONNumber.java +++ /dev/null @@ -1,81 +0,0 @@ -package cn.hutool.json; - -import cn.hutool.core.lang.mutable.MutableEntry; -import cn.hutool.core.math.NumberUtil; - -import java.io.IOException; -import java.io.Writer; -import java.util.function.Predicate; - -/** - * JSON数字表示 - * - * @author looly - * @since 6.0.0 - */ -public class JSONNumber extends Number implements JSON { - private static final long serialVersionUID = 1L; - - private final Number value; - /** - * 配置项 - */ - private final JSONConfig config; - - /** - * 构造 - * - * @param value 值 - * @param config JSON配置 - */ - public JSONNumber(final Number value, final JSONConfig config) { - this.value = value; - this.config = config; - } - - @Override - public JSONConfig getConfig() { - return this.config; - } - - @Override - public int size() { - return 1; - } - - @Override - public Writer write(final Writer writer, final int indentFactor, final int indent, - final Predicate> predicate) throws JSONException { - try { - writer.write(toString()); - } catch (final IOException e) { - throw new RuntimeException(e); - } - return writer; - } - - @Override - public int intValue() { - return this.value.intValue(); - } - - @Override - public long longValue() { - return this.value.longValue(); - } - - @Override - public float floatValue() { - return this.value.floatValue(); - } - - @Override - public double doubleValue() { - return this.value.doubleValue(); - } - - @Override - public String toString() { - return NumberUtil.toStr(this.value); - } -} diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONString.java b/hutool-json/src/main/java/cn/hutool/json/JSONString.java deleted file mode 100755 index 435947307..000000000 --- a/hutool-json/src/main/java/cn/hutool/json/JSONString.java +++ /dev/null @@ -1,76 +0,0 @@ -package cn.hutool.json; - -import cn.hutool.core.lang.mutable.MutableEntry; - -import java.io.IOException; -import java.io.Writer; -import java.util.function.Predicate; - -/** - * JSON字符串，表示一个字符串 - * - * @author looly - * @since 6.0.0 - */ -public class JSONString implements JSON, CharSequence { - private static final long serialVersionUID = 1L; - - private final char[] value; - /** - * 配置项 - */ - private final JSONConfig config; - - /** - * 构造 - * - * @param value char数组 - * @param config 配置项 - */ - public JSONString(final char[] value, final JSONConfig config) { - this.value = value; - this.config = config; - } - - @Override - public JSONConfig getConfig() { - return this.config; - } - - @Override - public int size() { - return length(); - } - - @Override - public Writer write(final Writer writer, final int indentFactor, final int indent, - final Predicate> predicate) throws JSONException { - try { - writer.write(this.value); - } catch (final IOException e) { - throw new RuntimeException(e); - } - return writer; - } - - @Override - public int length() { - return this.value.length; - } - - @Override - public char charAt(final int index) { - return this.value[index]; - } - - @Override - public CharSequence subSequence(final int start, final int end) { - return ((start == 0) && (end == this.value.length)) ? this - : new String(this.value, start, end); - } - - @Override - public String toString() { - return String.valueOf(this.value); - } -} diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONUtil.java b/hutool-json/src/main/java/cn/hutool/json/JSONUtil.java index 55d71d46b..7863af839 100755 --- a/hutool-json/src/main/java/cn/hutool/json/JSONUtil.java +++ b/hutool-json/src/main/java/cn/hutool/json/JSONUtil.java @@ -2,6 +2,7 @@ package cn.hutool.json; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IORuntimeException; +import cn.hutool.core.io.file.FileReader; import cn.hutool.core.reflect.TypeReference; import cn.hutool.core.text.StrUtil; import cn.hutool.core.util.ObjUtil; @@ -27,7 +28,6 @@ import java.util.List; public class JSONUtil { // -------------------------------------------------------------------- Pause start - /** * 创建JSONObject * @@ -139,8 +139,8 @@ public class JSONUtil { * @param obj 对象 * @return JSON */ - public static JSON parse(final Object obj) { - return JSONConverter.INSTANCE.toJSON(obj); + public static Object parse(final Object obj) { + return parse(obj, null); } /** @@ -154,10 +154,12 @@ public class JSONUtil { * * @param obj 对象 * @param config JSON配置，{@code null}使用默认配置 - * @return JSON - * @since 5.3.1 + * @return JSON（JSONObject or JSONArray） */ - public static JSON parse(final Object obj, final JSONConfig config) { + public static Object parse(final Object obj, final JSONConfig config) { + if(null == config){ + return JSONConverter.INSTANCE.toJSON(obj); + } return JSONConverter.of(config).toJSON(obj); } @@ -173,6 +175,7 @@ public class JSONUtil { // -------------------------------------------------------------------- Parse end // -------------------------------------------------------------------- Read start + /** * 读取JSON * @@ -182,11 +185,7 @@ public class JSONUtil { * @throws IORuntimeException IO异常 */ public static JSON readJSON(final File file, final Charset charset) throws IORuntimeException { - try (final Reader reader = FileUtil.getReader(file, charset)) { - return parse(reader); - } catch (final IOException e) { - throw new IORuntimeException(e); - } + return (JSON) FileUtil.read(file, charset, JSONUtil::parse); } /** @@ -198,11 +197,7 @@ public class JSONUtil { * @throws IORuntimeException IO异常 */ public static JSONObject readJSONObject(final File file, final Charset charset) throws IORuntimeException { - try (final Reader reader = FileUtil.getReader(file, charset)) { - return parseObj(reader); - } catch (final IOException e) { - throw new IORuntimeException(e); - } + return FileUtil.read(file, charset, JSONUtil::parseObj); } /** @@ -214,67 +209,23 @@ public class JSONUtil { * @throws IORuntimeException IO异常 */ public static JSONArray readJSONArray(final File file, final Charset charset) throws IORuntimeException { - try (final Reader reader = FileUtil.getReader(file, charset)) { - return parseArray(reader); - } catch (final IOException e) { - throw new IORuntimeException(e); - } + return FileUtil.read(file, charset, JSONUtil::parseArray); } // -------------------------------------------------------------------- Read end // -------------------------------------------------------------------- toString start - /** - * 转为JSON字符串 + * 转换为格式化后的JSON字符串 * - * @param json JSON - * @param indentFactor 每一级别的缩进 + * @param obj Bean对象 * @return JSON字符串 */ - public static String toJsonStr(final JSON json, final int indentFactor) { - if (null == json) { - return null; + public static String toJsonPrettyStr(Object obj) { + obj = parse(obj); + if (obj instanceof JSON) { + return ((JSON) obj).toStringPretty(); } - return json.toJSONString(indentFactor); - } - - /** - * 转为JSON字符串 - * - * @param json JSON - * @return JSON字符串 - */ - public static String toJsonStr(final JSON json) { - if (null == json) { - return null; - } - return json.toJSONString(0); - } - - /** - * 转为JSON字符串，并写出到write - * - * @param json JSON - * @param writer Writer - * @since 5.3.3 - */ - public static void toJsonStr(final JSON json, final Writer writer) { - if (null != json) { - json.write(writer); - } - } - - /** - * 转为JSON字符串 - * - * @param json JSON - * @return JSON字符串 - */ - public static String toJsonPrettyStr(final JSON json) { - if (null == json) { - return null; - } - return json.toStringPretty(); + return StrUtil.toStringOrNull(obj); } /** @@ -299,7 +250,7 @@ public class JSONUtil { public static String toJsonStr(final Object obj, final JSONConfig jsonConfig) { // 自定义规则，优先级高于全局规则 final JSONValueWriter valueWriter = InternalJSONUtil.getValueWriter(obj); - if(null != valueWriter){ + if (null != valueWriter) { final StringWriter stringWriter = new StringWriter(); final JSONWriter jsonWriter = JSONWriter.of(stringWriter, 0, 0, null); // 用户对象自定义实现了JSONValueWriter接口，理解为需要自定义输出 @@ -307,17 +258,10 @@ public class JSONUtil { return stringWriter.toString(); } - if (null == obj) { + if(null == obj){ return null; } - if (obj instanceof CharSequence) { - return StrUtil.str((CharSequence) obj); - } - - if (obj instanceof Number) { - return obj.toString(); - } - return toJsonStr(parse(obj, jsonConfig)); + return parse(obj, jsonConfig).toString(); } /** @@ -327,20 +271,20 @@ public class JSONUtil { * @param writer Writer * @since 5.3.3 */ - public static void toJsonStr(final Object obj, final Writer writer) { + public static void toJsonStr(Object obj, final Writer writer) { if (null != obj) { - toJsonStr(parse(obj), writer); - } - } + obj = parse(obj); + if (obj instanceof JSON) { + ((JSON) obj).write(writer); + } - /** - * 转换为格式化后的JSON字符串 - * - * @param obj Bean对象 - * @return JSON字符串 - */ - public static String toJsonPrettyStr(final Object obj) { - return toJsonPrettyStr(parse(obj)); + // 普通值 + try { + writer.write(obj.toString()); + } catch (final IOException e) { + throw new IORuntimeException(e); + } + } } /** @@ -393,7 +337,7 @@ public class JSONUtil { * @since 5.8.0 */ public static T toBean(final String jsonString, final JSONConfig config, final Class beanClass) { - return toBean(parse(jsonString, config), beanClass); + return toBean(jsonString, config, (Type) beanClass); } /** @@ -405,23 +349,12 @@ public class JSONUtil { * @param config JSON配置 * @param type Bean类型 * @return 实体类对象 + * @throws JSONException 提供的JSON字符串不支持转Bean或字符串错误 */ - public static T toBean(final String jsonString, final JSONConfig config, final Type type) { + public static T toBean(final String jsonString, final JSONConfig config, final Type type) throws JSONException { return toBean(parse(jsonString, config), type); } - /** - * 转为实体类对象，转换异常将被抛出 - * - * @param Bean类型 - * @param json JSONObject - * @param beanClass 实体类对象 - * @return 实体类对象 - */ - public static T toBean(final JSONObject json, final Class beanClass) { - return null == json ? null : json.toBean(beanClass); - } - /** * 转为实体类对象 * @@ -431,24 +364,27 @@ public class JSONUtil { * @return 实体类对象 * @since 4.6.2 */ - public static T toBean(final JSON json, final TypeReference typeReference) { + public static T toBean(final Object json, final TypeReference typeReference) { return toBean(json, typeReference.getType()); } /** * 转为实体类对象 * - * @param Bean类型 - * @param json JSONObject - * @param beanType 实体类对象类型 + * @param Bean类型 + * @param json JSONObject + * @param type 实体类对象类型 * @return 实体类对象 * @since 4.3.2 */ - public static T toBean(final JSON json, final Type beanType) { + public static T toBean(final Object json, final Type type) { if (null == json) { return null; } - return json.toBean(beanType); + if (json instanceof JSON) { + return ((JSON) json).toBean(type); + } + throw new JSONException("Unsupported json string to bean : {}", json); } // -------------------------------------------------------------------- toBean end @@ -562,13 +498,13 @@ public class JSONUtil { * @param json JSONObject或JSONArray * @return 是否为空 */ - public static boolean isEmpty(final JSON json){ - if(null == json){ + public static boolean isEmpty(final JSON json) { + if (null == json) { return true; } - if(json instanceof JSONObject){ + if (json instanceof JSONObject) { return ((JSONObject) json).isEmpty(); - } else if(json instanceof JSONArray){ + } else if (json instanceof JSONArray) { return ((JSONArray) json).isEmpty(); } return false; diff --git a/hutool-json/src/main/java/cn/hutool/json/convert/JSONConverter.java b/hutool-json/src/main/java/cn/hutool/json/convert/JSONConverter.java index 0aea0ed49..5792475b9 100644 --- a/hutool-json/src/main/java/cn/hutool/json/convert/JSONConverter.java +++ b/hutool-json/src/main/java/cn/hutool/json/convert/JSONConverter.java @@ -111,32 +111,34 @@ public class JSONConverter implements Converter { /** * 实现Object对象转换为{@link JSON}，支持的对象： *
    - *
  • String: 转换为相应的对象
    • + *
  • String: 转换为相应的对象，
    • *
  • Array、Iterable、Iterator：转换为JSONArray
    • *
  • Bean对象：转为JSONObject
    • + *
  • Number：返回原对象
    • *
* * @param obj 被转换的对象 * @return 转换后的对象 * @throws JSONException 转换异常 */ - public JSON toJSON(final Object obj) throws JSONException { + public Object toJSON(final Object obj) throws JSONException { final JSON json; - if (obj instanceof JSON) { - json = (JSON) obj; + if (obj instanceof JSON || obj instanceof Number) { + return obj; } else if (obj instanceof CharSequence) { final String jsonStr = StrUtil.trim((CharSequence) obj); switch (jsonStr.charAt(0)){ case '"': case '\'': - return new JSONString(jsonStr.toCharArray(), config); + // JSON字符串值 + return jsonStr; case '[': return new JSONArray(jsonStr, config); case '{': return new JSONObject(jsonStr, config); default: if(NumberUtil.isNumber(jsonStr)){ - return new JSONNumber(NumberUtil.toBigDecimal(jsonStr), config); + return NumberUtil.toBigDecimal(jsonStr); } throw new JSONException("Unsupported String to JSON: {}", jsonStr); } diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI6LBZATest.java b/hutool-json/src/test/java/cn/hutool/json/IssueI6LBZATest.java index b38e5232f..161ec6f7f 100755 --- a/hutool-json/src/test/java/cn/hutool/json/IssueI6LBZATest.java +++ b/hutool-json/src/test/java/cn/hutool/json/IssueI6LBZATest.java @@ -3,32 +3,34 @@ package cn.hutool.json; import org.junit.Assert; import org.junit.Test; +import java.math.BigDecimal; + public class IssueI6LBZATest { @Test public void parseJSONStringTest() { final String a = "\"a\""; - final JSON parse = JSONUtil.parse(a); - Assert.assertEquals(JSONString.class, parse.getClass()); + final Object parse = JSONUtil.parse(a); + Assert.assertEquals(String.class, parse.getClass()); } @Test public void parseJSONStringTest2() { final String a = "'a'"; - final JSON parse = JSONUtil.parse(a); - Assert.assertEquals(JSONString.class, parse.getClass()); + final Object parse = JSONUtil.parse(a); + Assert.assertEquals(String.class, parse.getClass()); } @Test(expected = JSONException.class) public void parseJSONErrorTest() { final String a = "a"; - final JSON parse = JSONUtil.parse(a); - Assert.assertEquals(JSONString.class, parse.getClass()); + final Object parse = JSONUtil.parse(a); + Assert.assertEquals(String.class, parse.getClass()); } @Test public void parseJSONNumberTest() { final String a = "123"; - final JSON parse = JSONUtil.parse(a); - Assert.assertEquals(JSONNumber.class, parse.getClass()); + final Object parse = JSONUtil.parse(a); + Assert.assertEquals(BigDecimal.class, parse.getClass()); } } diff --git a/hutool-json/src/test/java/cn/hutool/json/JSONArrayTest.java b/hutool-json/src/test/java/cn/hutool/json/JSONArrayTest.java index 4e366e50b..97a3ca581 100755 --- a/hutool-json/src/test/java/cn/hutool/json/JSONArrayTest.java +++ b/hutool-json/src/test/java/cn/hutool/json/JSONArrayTest.java @@ -42,8 +42,7 @@ public class JSONArrayTest { @Test public void addNullTest() { final List aaa = ListUtil.view("aaa", null); - final String jsonStr = JSONUtil.toJsonStr(JSONUtil.parse(aaa, - JSONConfig.of().setIgnoreNullValue(false))); + final String jsonStr = JSONUtil.toJsonStr(JSONUtil.parse(aaa, JSONConfig.of().setIgnoreNullValue(false))); Assert.assertEquals("[\"aaa\",null]", jsonStr); } diff --git a/hutool-json/src/test/java/cn/hutool/json/JSONPathTest.java b/hutool-json/src/test/java/cn/hutool/json/JSONPathTest.java index 2e0c88d11..9765ca509 100644 --- a/hutool-json/src/test/java/cn/hutool/json/JSONPathTest.java +++ b/hutool-json/src/test/java/cn/hutool/json/JSONPathTest.java @@ -23,7 +23,7 @@ public class JSONPathTest { @Test public void getByPathTest2(){ final String str = "{'accountId':111}"; - final JSON json = JSONUtil.parse(str); + final JSON json = (JSON) JSONUtil.parse(str); final Long accountId = JSONUtil.getByPath(json, "$.accountId", 0L); Assert.assertEquals(111L, accountId.longValue()); } 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 fcfeeb590..6ad70ddb2 100644 --- a/hutool-json/src/test/java/cn/hutool/json/JSONUtilTest.java +++ b/hutool-json/src/test/java/cn/hutool/json/JSONUtilTest.java @@ -2,6 +2,7 @@ package cn.hutool.json; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.lang.Console; import cn.hutool.core.map.MapUtil; import cn.hutool.core.math.NumberUtil; import cn.hutool.json.serialize.JSONStringer; @@ -235,9 +236,11 @@ public class JSONUtilTest { Assert.assertEquals("v1abc", xmlStr); } - @Test + @Test(expected = JSONException.class) public void toJsonStrOfStringTest(){ final String a = "a"; + + // 普通字符串不能解析为JSON字符串，必须由双引号或者单引号包裹 final String s = JSONUtil.toJsonStr(a); Assert.assertEquals(a, s); }