diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/InternalJSONUtil.java b/hutool-json/src/main/java/org/dromara/hutool/json/InternalJSONUtil.java index 518021b72..cc07d39f0 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/InternalJSONUtil.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/InternalJSONUtil.java @@ -230,7 +230,7 @@ public final class InternalJSONUtil { final String segment = path[i]; JSONObject nextTarget = target.getJSONObject(segment); if (nextTarget == null) { - nextTarget = new JSONObject(target.getConfig()); + nextTarget = new JSONObject(target.config()); target.set(segment, nextTarget, predicate); } target = nextTarget; 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 3ab77fd91..aec05fac8 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 @@ -37,7 +37,7 @@ public interface JSON extends Converter, Cloneable, Serializable { * @return {@link JSONConfig} * @since 5.3.0 */ - JSONConfig getConfig(); + JSONConfig config(); /** * JSON大小,对于JSONObject,是键值对的多少,JSONArray则是元素的个数 @@ -123,7 +123,7 @@ public interface JSON extends Converter, Cloneable, Serializable { */ @SuppressWarnings("unchecked") default T getByPath(final String expression, final Class resultType){ - return (T) getConfig().getConverter().convert(resultType, getByPath(expression)); + return (T) config().getConverter().convert(resultType, getByPath(expression)); } /** @@ -191,6 +191,6 @@ public interface JSON extends Converter, Cloneable, Serializable { @Override default Object convert(final Type targetType, final Object value) throws ConvertException { - return JSONConverter.of(getConfig()).convert(targetType, value); + return JSONConverter.of(config()).convert(targetType, value); } } diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/JSONArray.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSONArray.java index d55c79b80..c54371ce5 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/JSONArray.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSONArray.java @@ -165,7 +165,7 @@ public class JSONArray implements JSON, JSONGetter, List, Rando // endregion @Override - public JSONConfig getConfig() { + public JSONConfig config() { return this.config; } diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/JSONGetter.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSONGetter.java index bdd8cc1db..5e40733b4 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/JSONGetter.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSONGetter.java @@ -32,7 +32,7 @@ public interface JSONGetter extends TypeGetter { * @return {@link JSONConfig} * @since 5.3.0 */ - JSONConfig getConfig(); + JSONConfig config(); /** * key对应值是否为{@code null}或无此key @@ -83,7 +83,7 @@ public interface JSONGetter extends TypeGetter { if (object instanceof JSON) { return (JSONArray) object; } - return new JSONArray(object, getConfig()); + return new JSONArray(object, config()); } /** @@ -102,7 +102,7 @@ public interface JSONGetter extends TypeGetter { if (object instanceof JSON) { return (JSONObject) object; } - return new JSONObject(object, getConfig()); + return new JSONObject(object, config()); } /** @@ -142,6 +142,6 @@ public interface JSONGetter extends TypeGetter { return defaultValue; } - return get(key, type, getConfig().getConverter(), defaultValue); + return get(key, type, config().getConverter(), defaultValue); } } diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/JSONObject.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSONObject.java index 9db938564..e2a84283b 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/JSONObject.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSONObject.java @@ -149,7 +149,7 @@ public class JSONObject extends MapWrapper implements JSON, JSON // -------------------------------------------------------------------------------------------------------------------- Constructor end @Override - public JSONConfig getConfig() { + public JSONConfig config() { return this.config; } @@ -215,7 +215,7 @@ public class JSONObject extends MapWrapper implements JSON, JSON */ @Override public Object put(final String key, final Object value) throws JSONException { - return put(key, value, null, getConfig().isCheckDuplicate()); + return put(key, value, null, config().isCheckDuplicate()); } /** @@ -258,7 +258,7 @@ public class JSONObject extends MapWrapper implements JSON, JSON * @since 5.8.0 */ public JSONObject set(final String key, final Object value, final Predicate> predicate) throws JSONException { - put(key, value, predicate, getConfig().isCheckDuplicate()); + put(key, value, predicate, config().isCheckDuplicate()); return this; } diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/JSONSupport.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSONSupport.java index 898096a90..919d9ea37 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/JSONSupport.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSONSupport.java @@ -42,7 +42,7 @@ public class JSONSupport implements JSONStringer, JSONDeserializer { public Object deserialize(final JSON json) { BeanCopier.of(json, this, this.getClass(), - InternalJSONUtil.toCopyOptions(json.getConfig())).copy(); + InternalJSONUtil.toCopyOptions(json.config())).copy(); return this; } 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 db1459d6c..83f387e15 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 @@ -212,11 +212,11 @@ public class JSONConverter implements Converter { if (BeanUtil.isBean(rawType)) { return BeanCopier.of(json, ConstructorUtil.newInstanceIfPossible(rawType), targetType, - InternalJSONUtil.toCopyOptions(json.getConfig())).copy(); + InternalJSONUtil.toCopyOptions(json.config())).copy(); } // 跳过异常时返回null - if (json.getConfig().isIgnoreError()) { + if (json.config().isIgnoreError()) { return null; } diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/mapper/JSONArrayMapper.java b/hutool-json/src/main/java/org/dromara/hutool/json/mapper/JSONArrayMapper.java index 81d87d2e4..d6a236801 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/mapper/JSONArrayMapper.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/mapper/JSONArrayMapper.java @@ -96,13 +96,13 @@ public class JSONArrayMapper { // JSON字符串 mapFromStr((CharSequence) source, jsonArray); } else if (source instanceof Reader) { - mapFromTokener(new JSONTokener((Reader) source, jsonArray.getConfig()), jsonArray); + mapFromTokener(new JSONTokener((Reader) source, jsonArray.config()), jsonArray); } else if (source instanceof InputStream) { - mapFromTokener(new JSONTokener((InputStream) source, jsonArray.getConfig()), jsonArray); + mapFromTokener(new JSONTokener((InputStream) source, jsonArray.config()), jsonArray); } else if (source instanceof byte[]) { final byte[] bytesSource = (byte[]) source; if ('[' == bytesSource[0] && ']' == bytesSource[bytesSource.length - 1]) { - mapFromTokener(new JSONTokener(IoUtil.toStream(bytesSource), jsonArray.getConfig()), jsonArray); + mapFromTokener(new JSONTokener(IoUtil.toStream(bytesSource), jsonArray.config()), jsonArray); } else { // https://github.com/dromara/hutool/issues/2369 // 非标准的二进制流,则按照普通数组对待 @@ -119,7 +119,7 @@ public class JSONArrayMapper { } else if (source instanceof Iterable) {// Iterable iter = ((Iterable) source).iterator(); } else { - if(false == jsonArray.getConfig().isIgnoreError()){ + if(false == jsonArray.config().isIgnoreError()){ throw new JSONException("JSONArray initial value should be a string or collection or array."); } // 如果用户选择跳过异常,则跳过此值转换 @@ -145,7 +145,7 @@ public class JSONArrayMapper { */ private void mapFromStr(final CharSequence source, final JSONArray jsonArray) { if (null != source) { - mapFromTokener(new JSONTokener(StrUtil.trim(source), jsonArray.getConfig()), jsonArray); + mapFromTokener(new JSONTokener(StrUtil.trim(source), jsonArray.config()), jsonArray); } } diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/mapper/JSONObjectMapper.java b/hutool-json/src/main/java/org/dromara/hutool/json/mapper/JSONObjectMapper.java index dd67db840..b6d4295a1 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/mapper/JSONObjectMapper.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/mapper/JSONObjectMapper.java @@ -117,11 +117,11 @@ public class JSONObjectMapper { // 可能为JSON字符串 mapFromStr((CharSequence) source, jsonObject); } else if (source instanceof Reader) { - mapFromTokener(new JSONTokener((Reader) source, jsonObject.getConfig()), jsonObject); + mapFromTokener(new JSONTokener((Reader) source, jsonObject.config()), jsonObject); } else if (source instanceof InputStream) { - mapFromTokener(new JSONTokener((InputStream) source, jsonObject.getConfig()), jsonObject); + mapFromTokener(new JSONTokener((InputStream) source, jsonObject.config()), jsonObject); } else if (source instanceof byte[]) { - mapFromTokener(new JSONTokener(IoUtil.toStream((byte[]) source), jsonObject.getConfig()), jsonObject); + mapFromTokener(new JSONTokener(IoUtil.toStream((byte[]) source), jsonObject.config()), jsonObject); } else if (source instanceof ResourceBundle) { // ResourceBundle mapFromResourceBundle((ResourceBundle) source, jsonObject); @@ -129,7 +129,7 @@ public class JSONObjectMapper { // 普通Bean mapFromBean(source, jsonObject); } else { - if(false == jsonObject.getConfig().isIgnoreError()){ + if(false == jsonObject.config().isIgnoreError()){ // 不支持对象类型转换为JSONObject throw new JSONException("Unsupported type [{}] to JSONObject!", source.getClass()); } @@ -167,7 +167,7 @@ public class JSONObjectMapper { JSONXMLUtil.toJSONObject(jsonObject, jsonStr, false); return; } - mapFromTokener(new JSONTokener(StrUtil.trim(source), jsonObject.getConfig()), jsonObject); + mapFromTokener(new JSONTokener(StrUtil.trim(source), jsonObject.config()), jsonObject); } /** @@ -187,7 +187,7 @@ public class JSONObjectMapper { * @param jsonObject {@link JSONObject} */ private void mapFromBean(final Object bean, final JSONObject jsonObject) { - final CopyOptions copyOptions = InternalJSONUtil.toCopyOptions(jsonObject.getConfig()); + final CopyOptions copyOptions = InternalJSONUtil.toCopyOptions(jsonObject.config()); if (null != this.predicate) { copyOptions.setFieldEditor((entry -> this.predicate.test(entry) ? entry : null)); } diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLParser.java b/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLParser.java index adb1c81ec..66000159f 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLParser.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/xml/JSONXMLParser.java @@ -35,7 +35,7 @@ public class JSONXMLParser { * @throws JSONException 解析异常 */ public static void parseJSONObject(final JSONObject jo, final String xmlStr, final boolean keepStrings) throws JSONException { - final XMLTokener x = new XMLTokener(xmlStr, jo.getConfig()); + final XMLTokener x = new XMLTokener(xmlStr, jo.config()); while (x.more() && x.skipPast("<")) { parse(x, jo, null, keepStrings); } diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/JSONNullTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/JSONNullTest.java index ac698763f..28c51e3b8 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/JSONNullTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/JSONNullTest.java @@ -16,7 +16,7 @@ public class JSONNullTest { Assertions.assertNull(bodyjson.get("device_status_date")); Assertions.assertNull(bodyjson.get("imsi")); - bodyjson.getConfig().setIgnoreNullValue(true); + bodyjson.config().setIgnoreNullValue(true); Assertions.assertEquals("{\"act_date\":\"2021-07-23T06:23:26.000+00:00\"}", bodyjson.toString()); } diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/JSONObjectTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/JSONObjectTest.java index 794d4783c..db2e80900 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/JSONObjectTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/JSONObjectTest.java @@ -49,7 +49,7 @@ public class JSONObjectTest { //noinspection MismatchedQueryAndUpdateOfCollection final JSONObject jsonObject = new JSONObject(str); Assertions.assertEquals("{\"code\":500,\"data\":null}", jsonObject.toString()); - jsonObject.getConfig().setIgnoreNullValue(true); + jsonObject.config().setIgnoreNullValue(true); Assertions.assertEquals("{\"code\":500}", jsonObject.toString()); } diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/JSONUtilTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/JSONUtilTest.java index 5b3749709..3ef1a19d5 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/JSONUtilTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/JSONUtilTest.java @@ -260,7 +260,7 @@ public class JSONUtilTest { Assertions.assertEquals("{\"test2\":12.0}", jsonObject.toString()); // 去除多余的0 - jsonObject.getConfig().setStripTrailingZeros(true); + jsonObject.config().setStripTrailingZeros(true); Assertions.assertEquals("{\"test2\":12}", jsonObject.toString()); }