Backups/JSON-java
1
0
Fork 0
mirror of https://github.com/stleary/JSON-java.git synced 2026-01-24 00:03:17 -05:00
Code Issues Projects Releases Wiki Activity

Use JSONParserConfiguration to decide on serializing null fields into JSONObject #982

Browse Source
This commit is contained in:
hboggavarapu
2025-05-23 17:57:08 +05:30
parent 24fafcffeb
commit dadc3e59dc
2 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/org/json/JSONObject.java
View File

@@ -401,12 +401,17 @@ public class JSONObject {
*/
public JSONObject(Object bean) {
this();
this.populateMap(bean);
this.populateMap(bean, new JSONParserConfiguration());
}
public JSONObject(Object bean, JSONParserConfiguration jsonParserConfiguration) {
this();
this.populateMap(bean, jsonParserConfiguration);
}
private JSONObject(Object bean, Set<Object> objectsRecord) {
this();
this.populateMap(bean, objectsRecord);
this.populateMap(bean, objectsRecord, new JSONParserConfiguration());
}
/**
@@ -1764,11 +1769,11 @@ public class JSONObject {
* @throws JSONException
* If a getter returned a non-finite number.
*/
private void populateMap(Object bean) {
populateMap(bean, Collections.newSetFromMap(new IdentityHashMap<Object, Boolean>()));
private void populateMap(Object bean, JSONParserConfiguration jsonParserConfiguration) {
populateMap(bean, Collections.newSetFromMap(new IdentityHashMap<Object, Boolean>()), jsonParserConfiguration);
}
private void populateMap(Object bean, Set<Object> objectsRecord) {
private void populateMap(Object bean, Set<Object> objectsRecord, JSONParserConfiguration jsonParserConfiguration) {
Class<?> klass = bean.getClass();
// If klass is a System class then set includeSuperClass to false.
@@ -1788,7 +1793,7 @@ public class JSONObject {
if (key != null && !key.isEmpty()) {
try {
final Object result = method.invoke(bean);
if (result != null) {
if (result != null || jsonParserConfiguration.isUseNativeNulls()) {
// check cyclic dependency and throw error if needed
// the wrap and populateMap combination method is
// itself DFS recursive