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
2019-10-29 19:53:17 +08:00
parent f9ee2af71c
commit e754ec3e86
45 changed files with 172 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
hutool-json/src/main/java/cn/hutool/json/XML.java
View File

@@ -2,7 +2,9 @@ package cn.hutool.json;
import java.util.Iterator;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.CharUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.XmlUtil;
/**
@@ -46,12 +48,12 @@ public class XML {
* @param context The JSONObject that will include the new material.
* @param name The tag name.
* @return true if the close tag is processed.
* @throws JSONException
* @throws JSONException JSON异常
*/
private static boolean parse(XMLTokener x, JSONObject context, String name, boolean keepStrings) throws JSONException {
char c;
int i;
JSONObject jsonobject = null;
JSONObject jsonobject;
String string;
String tagName;
Object token;
@@ -265,7 +267,6 @@ public class XML {
JSONObject jo;
String key;
Iterator<String> keys;
String string;
Object value;
if (object instanceof JSONObject) {
@@ -284,11 +285,10 @@ public class XML {
key = keys.next();
value = jo.get(key);
if (value == null) {
value = "";
} else if (value.getClass().isArray()) {
value = StrUtil.EMPTY;
} else if (ArrayUtil.isArray(value)) {
value = new JSONArray(value);
}
string = value instanceof String ? (String) value : null;
// Emit content in body
if ("content".equals(key)) {
@@ -362,8 +362,10 @@ public class XML {
}
}
string = (object == null) ? "null" : XmlUtil.escape(object.toString());
return (tagName == null) ? "\"" + string + "\"" : (string.length() == 0) ? "<" + tagName + "/>" : "<" + tagName + ">" + string + "</" + tagName + ">";
String string = (object == null) ? StrUtil.NULL : XmlUtil.escape(object.toString());
return (tagName == null) ?
"\"" + string + "\"" : (string.length() == 0) ? "<" + tagName + "/>"
: "<" + tagName + ">" + string + "</" + tagName + ">";
}
}