Backups/JSON-java
1
0
Fork 0
mirror of https://github.com/stleary/JSON-java.git synced 2025-08-03 03:15:32 -04:00
Code Issues Projects Releases Wiki Activity

fixed keeping null as string

Browse Source
This commit is contained in:
marilynel 2025-07-06 12:37:05 -08:00
parent d7593fb808
commit 3dce55794f
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/json/XML.java
View File

@ -428,6 +428,9 @@ public class XML {
config.isKeepNumberAsString() config.isKeepNumberAsString()
? ((String) token) ? ((String) token)
: obj); : obj);
} else if (obj == JSONObject.NULL) {
jsonObject.accumulate(config.getcDataTagName(),
config.isKeepStrings() ? ((String) token) : obj);
} else { } else {
jsonObject.accumulate(config.getcDataTagName(), stringToValue((String) token)); jsonObject.accumulate(config.getcDataTagName(), stringToValue((String) token));
} }

12
src/test/java/org/json/junit/XMLConfigurationTest.java
View File

@ -794,6 +794,18 @@ public class XMLConfigurationTest {
Util.compareActualVsExpectedJsonObjects(actualJsonOutput,expected); Util.compareActualVsExpectedJsonObjects(actualJsonOutput,expected);
} }
/**
* null is "null" when keepStrings == true
*/
@Test
public void testToJSONArray_jsonOutput_null_withKeepString() {
final String originalXml = "<root><id>01</id><id>1</id><id>00</id><id>0</id><item id=\"01\"/><title>null</title></root>";
final JSONObject expected = new JSONObject("{\"root\":{\"item\":{\"id\":\"01\"},\"id\":[\"01\",\"1\",\"00\",\"0\"],\"title\":\"null\"}}");
final JSONObject actualJsonOutput = XML.toJSONObject(originalXml,
new XMLParserConfiguration().withKeepStrings(true));
Util.compareActualVsExpectedJsonObjects(actualJsonOutput,expected);
}
/** /**
* Test keepStrings behavior when setting keepBooleanAsString, keepNumberAsString * Test keepStrings behavior when setting keepBooleanAsString, keepNumberAsString
*/ */