ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-04-19 03:01:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly 2024-09-13 15:55:21 +08:00
parent 98de15b455
commit 47fe46c495
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hutool-json/src/main/java/org/dromara/hutool/json/reader/JSONParser.java
View File

@ -101,7 +101,9 @@ public class JSONParser {
* @return JSON值 * @return JSON值
*/ */
public JSON parse() { public JSON parse() {
return nextJSON(tokener.nextClean()); final JSON json = nextJSON(tokener.nextClean());
tokener.checkEnd();
return json;
} }
/** /**
@ -183,15 +185,14 @@ public class JSONParser {
tokener.nextColon(); tokener.nextColon();
// 过滤并设置键值对 // 过滤并设置键值对
JSON value = parse(); final JSON value = nextJSON(tokener.nextClean());
// 添加前置过滤，通过MutablePair实现过滤、修改键值对等 // 添加前置过滤，通过MutablePair实现过滤、修改键值对等
if (null != predicate) { if (null != predicate) {
final MutableEntry<Object, Object> entry = new MutableEntry<>(key, value); final MutableEntry<Object, Object> entry = new MutableEntry<>(key, value);
if (predicate.test(entry)) { if (predicate.test(entry)) {
// 使用修改后的键值对 // 使用修改后的键值对
key = (String) entry.getKey(); key = (String) entry.getKey();
value = (JSON) entry.getValue(); jsonObject.set(key, entry.getValue());
jsonObject.set(key, value);
} }
}else { }else {
jsonObject.set(key, value); jsonObject.set(key, value);

2
hutool-json/src/main/java/org/dromara/hutool/json/reader/JSONTokener.java
View File

@ -134,7 +134,7 @@ public class JSONTokener extends ReaderWrapper {
*/ */
public void checkEnd(){ public void checkEnd(){
if(EOF != nextClean()){ if(EOF != nextClean()){
throw syntaxError("Unread data"); throw syntaxError("Invalid JSON, Unread data after end.");
} }
} }