zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly
2022-04-29 01:46:01 +08:00
parent b2f0dc7b0f
commit c753a53173
561 changed files with 1532 additions and 4201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hutool-json/src/main/java/cn/hutool/json/InternalJSONUtil.java
View File

@@ -9,8 +9,8 @@ import cn.hutool.core.map.CaseInsensitiveTreeMap;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.CharUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.text.StrUtil;
import java.math.BigDecimal;
import java.util.Collection;
@@ -37,7 +37,7 @@ public final class InternalJSONUtil {
* @throws JSONException If o is a non-finite number.
*/
static Object testValidity(Object obj) throws JSONException {
if (false == ObjectUtil.isValidIfNumber(obj)) {
if (false == ObjUtil.isValidIfNumber(obj)) {
throw new JSONException("JSON does not allow non-finite numbers.");
}
return obj;

2
hutool-json/src/main/java/cn/hutool/json/JSON.java
View File

@@ -1,7 +1,7 @@
package cn.hutool.json;
import cn.hutool.core.bean.BeanPath;
import cn.hutool.core.lang.reflect.TypeReference;
import cn.hutool.core.reflect.TypeReference;
import java.io.Serializable;
import java.io.StringWriter;

6
hutool-json/src/main/java/cn/hutool/json/JSONArray.java
View File

@@ -7,7 +7,7 @@ import cn.hutool.core.lang.mutable.Mutable;
import cn.hutool.core.lang.mutable.MutableObj;
import cn.hutool.core.lang.mutable.MutablePair;
import cn.hutool.core.text.StrJoiner;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.json.serialize.JSONWriter;
import java.io.StringWriter;
@@ -90,7 +90,7 @@ public class JSONArray implements JSON, JSONGetter<Integer>, List<Object>, Rando
*/
public JSONArray(int initialCapacity, JSONConfig config) {
this.rawList = new ArrayList<>(initialCapacity);
this.config = ObjectUtil.defaultIfNull(config, JSONConfig::create);
this.config = ObjUtil.defaultIfNull(config, JSONConfig::create);
}
/**
@@ -557,7 +557,7 @@ public class JSONArray implements JSON, JSONGetter<Integer>, List<Object>, Rando
@Override
public Object clone() throws CloneNotSupportedException {
final JSONArray clone = (JSONArray) super.clone();
clone.rawList = ObjectUtil.clone(this.rawList);
clone.rawList = ObjUtil.clone(this.rawList);
return clone;
}

8
hutool-json/src/main/java/cn/hutool/json/JSONConverter.java
View File

@@ -7,9 +7,9 @@ import cn.hutool.core.convert.Converter;
import cn.hutool.core.convert.ConverterRegistry;
import cn.hutool.core.convert.impl.ArrayConverter;
import cn.hutool.core.convert.impl.BeanConverter;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.ReflectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.reflect.ReflectUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.core.util.TypeUtil;
import cn.hutool.json.serialize.GlobalSerializeMapping;
import cn.hutool.json.serialize.JSONDeserializer;
@@ -135,7 +135,7 @@ public class JSONConverter implements Converter<JSON> {
return null;
}
throw new ConvertException("Can not convert {} to type {}", value, ObjectUtil.defaultIfNull(TypeUtil.getClass(targetType), targetType));
throw new ConvertException("Can not convert {} to type {}", value, ObjUtil.defaultIfNull(TypeUtil.getClass(targetType), targetType));
}
return targetValue;

2
hutool-json/src/main/java/cn/hutool/json/JSONException.java
View File

@@ -1,7 +1,7 @@
package cn.hutool.json;
import cn.hutool.core.exceptions.ExceptionUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
/**
* JSON异常

2
hutool-json/src/main/java/cn/hutool/json/JSONGetter.java
View File

@@ -5,7 +5,7 @@ import cn.hutool.core.convert.ConvertException;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.date.LocalDateTimeUtil;
import cn.hutool.core.getter.OptNullBasicTypeFromObjectGetter;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import java.time.LocalDateTime;
import java.util.Date;

2
hutool-json/src/main/java/cn/hutool/json/JSONNull.java
View File

@@ -1,6 +1,6 @@
package cn.hutool.json;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import java.io.Serializable;

8
hutool-json/src/main/java/cn/hutool/json/JSONObject.java
View File

@@ -6,7 +6,7 @@ import cn.hutool.core.lang.func.Filter;
import cn.hutool.core.lang.mutable.MutablePair;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.map.MapWrapper;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.json.serialize.JSONWriter;
import java.io.StringWriter;
@@ -67,8 +67,8 @@ public class JSONObject extends MapWrapper<String, Object> implements JSON, JSON
* @since 4.1.19
*/
public JSONObject(int capacity, JSONConfig config) {
super(InternalJSONUtil.createRawMap(capacity, ObjectUtil.defaultIfNull(config, JSONConfig.create())));
this.config = ObjectUtil.defaultIfNull(config, JSONConfig.create());
super(InternalJSONUtil.createRawMap(capacity, ObjUtil.defaultIfNull(config, JSONConfig.create())));
this.config = ObjUtil.defaultIfNull(config, JSONConfig.create());
}
/**
@@ -458,7 +458,7 @@ public class JSONObject extends MapWrapper<String, Object> implements JSON, JSON
}
final boolean ignoreNullValue = this.config.isIgnoreNullValue();
if (ObjectUtil.isNull(value) && ignoreNullValue) {
if (ObjUtil.isNull(value) && ignoreNullValue) {
// 忽略值模式下如果值为空清除key
return this.remove(key);
} else if (checkDuplicate && containsKey(key)) {

2
hutool-json/src/main/java/cn/hutool/json/JSONStrFormatter.java
View File

@@ -1,7 +1,7 @@
package cn.hutool.json;
import cn.hutool.core.util.CharUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
/**
* JSON字符串格式化工具，用于简单格式化JSON字符串<br>

2
hutool-json/src/main/java/cn/hutool/json/JSONTokener.java
View File

@@ -1,7 +1,7 @@
package cn.hutool.json;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import java.io.BufferedReader;
import java.io.IOException;

12
hutool-json/src/main/java/cn/hutool/json/JSONUtil.java
View File

@@ -2,13 +2,13 @@ package cn.hutool.json;
import cn.hutool.core.io.IORuntimeException;
import cn.hutool.core.io.file.FileReader;
import cn.hutool.core.lang.reflect.TypeReference;
import cn.hutool.core.reflect.TypeReference;
import cn.hutool.core.map.MapWrapper;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ClassUtil;
import cn.hutool.core.codec.HexUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.core.util.TypeUtil;
import cn.hutool.json.serialize.GlobalSerializeMapping;
import cn.hutool.json.serialize.JSONArraySerializer;
@@ -555,7 +555,7 @@ public class JSONUtil {
if(null != defaultValue){
final Class<T> type = (Class<T>) defaultValue.getClass();
return ObjectUtil.defaultIfNull(json.getByPath(expression, type), defaultValue);
return ObjUtil.defaultIfNull(json.getByPath(expression, type), defaultValue);
}
return (T) json.getByPath(expression);
}
@@ -718,11 +718,11 @@ public class JSONUtil {
return jsonConfig.isIgnoreNullValue() ? null : JSONNull.NULL;
}
if (object instanceof JSON //
|| ObjectUtil.isNull(object) //
|| ObjUtil.isNull(object) //
|| object instanceof JSONString //
|| object instanceof CharSequence //
|| object instanceof Number //
|| ObjectUtil.isBasicType(object) //
|| ObjUtil.isBasicType(object) //
) {
return object;
}

2
hutool-json/src/main/java/cn/hutool/json/ObjectMapper.java
View File

@@ -8,7 +8,7 @@ import cn.hutool.core.lang.func.Filter;
import cn.hutool.core.lang.mutable.Mutable;
import cn.hutool.core.lang.mutable.MutablePair;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.core.util.TypeUtil;
import cn.hutool.json.serialize.GlobalSerializeMapping;
import cn.hutool.json.serialize.JSONObjectSerializer;

4
hutool-json/src/main/java/cn/hutool/json/jwt/JWT.java
View File

@@ -7,7 +7,7 @@ import cn.hutool.core.exceptions.ValidateException;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.CharUtil;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.jwt.signers.AlgorithmUtil;
import cn.hutool.json.jwt.signers.JWTSigner;
@@ -72,7 +72,7 @@ public class JWT implements RegisteredPayload<JWT> {
public JWT() {
this.header = new JWTHeader();
this.payload = new JWTPayload();
this.charset = CharsetUtil.CHARSET_UTF_8;
this.charset = CharsetUtil.UTF_8;
}
/**

2
hutool-json/src/main/java/cn/hutool/json/jwt/JWTException.java
View File

@@ -1,7 +1,7 @@
package cn.hutool.json.jwt;
import cn.hutool.core.exceptions.ExceptionUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
/**
* JWT异常

2
hutool-json/src/main/java/cn/hutool/json/jwt/JWTValidator.java
View File

@@ -2,7 +2,7 @@ package cn.hutool.json.jwt;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.exceptions.ValidateException;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.json.jwt.signers.JWTSigner;
import cn.hutool.json.jwt.signers.NoneJWTSigner;

6
hutool-json/src/main/java/cn/hutool/json/jwt/signers/AlgorithmUtil.java
View File

@@ -1,7 +1,7 @@
package cn.hutool.json.jwt.signers;
import cn.hutool.core.map.BiMap;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.crypto.asymmetric.SignAlgorithm;
import cn.hutool.crypto.digest.HmacAlgorithm;
@@ -42,7 +42,7 @@ public class AlgorithmUtil {
* @return 算法名
*/
public static String getAlgorithm(String idOrAlgorithm){
return ObjectUtil.defaultIfNull(getAlgorithmById(idOrAlgorithm), idOrAlgorithm);
return ObjUtil.defaultIfNull(getAlgorithmById(idOrAlgorithm), idOrAlgorithm);
}
/**
@@ -51,7 +51,7 @@ public class AlgorithmUtil {
* @return 算法ID
*/
public static String getId(String idOrAlgorithm){
return ObjectUtil.defaultIfNull(getIdByAlgorithm(idOrAlgorithm), idOrAlgorithm);
return ObjUtil.defaultIfNull(getIdByAlgorithm(idOrAlgorithm), idOrAlgorithm);
}
/**

4
hutool-json/src/main/java/cn/hutool/json/jwt/signers/AsymmetricJWTSigner.java
View File

@@ -2,7 +2,7 @@ package cn.hutool.json.jwt.signers;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.crypto.asymmetric.Sign;
import java.nio.charset.Charset;
@@ -19,7 +19,7 @@ import java.security.PublicKey;
*/
public class AsymmetricJWTSigner implements JWTSigner {
private Charset charset = CharsetUtil.CHARSET_UTF_8;
private Charset charset = CharsetUtil.UTF_8;
private final Sign sign;
/**

4
hutool-json/src/main/java/cn/hutool/json/jwt/signers/HMacJWTSigner.java
View File

@@ -1,7 +1,7 @@
package cn.hutool.json.jwt.signers;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.crypto.digest.HMac;
import java.nio.charset.Charset;
@@ -15,7 +15,7 @@ import java.security.Key;
*/
public class HMacJWTSigner implements JWTSigner {
private Charset charset = CharsetUtil.CHARSET_UTF_8;
private Charset charset = CharsetUtil.UTF_8;
private final HMac hMac;
/**

2
hutool-json/src/main/java/cn/hutool/json/jwt/signers/NoneJWTSigner.java
View File

@@ -1,6 +1,6 @@
package cn.hutool.json.jwt.signers;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
/**
* 无需签名的JWT签名器

2
hutool-json/src/main/java/cn/hutool/json/serialize/JSONWriter.java
View File

@@ -8,7 +8,7 @@ import cn.hutool.core.io.IORuntimeException;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.CharUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.json.JSON;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONConfig;

2
hutool-json/src/main/java/cn/hutool/json/xml/JSONXMLSerializer.java
View File

@@ -3,7 +3,7 @@ package cn.hutool.json.xml;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.CharUtil;
import cn.hutool.core.text.escape.EscapeUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONException;
import cn.hutool.json.JSONObject;