Skip to content

Json Null Serialization property was not working in all cases. #819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iroqueta merged 2 commits into from
Jan 24, 2024
Merged

Json Null Serialization property was not working in all cases. #819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a641a20
Json Null Serialization property was not working in all cases.
iroqueta Jan 17, 2024
58f803a
Merge branch 'master' into JsonNullSerialization
iroqueta Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions common/src/main/java/com/genexus/CommonUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2755,18 +2755,21 @@ public static Object convertObjectTo(Object obj, Class toClass, boolean fail) th
{
try
{

if (objStr.isEmpty() || objStr.equals("null"))
objStr ="0";
else
if (objStr.equals("null"))
return null;
else
{
int i = objStr.indexOf(".") ;
if (i >= 0)
if (objStr.isEmpty() || objStr.equals("null"))
objStr = "0";
else
{
if (objStr.indexOf('E') == -1 && objStr.indexOf('e') == -1)
objStr = objStr.substring(0, i);
else
objStr = CommonUtil.strUnexponentString(objStr);
int i = objStr.indexOf(".");
if (i >= 0) {
if (objStr.indexOf('E') == -1 && objStr.indexOf('e') == -1)
objStr = objStr.substring(0, i);
else
objStr = CommonUtil.strUnexponentString(objStr);
}
}
}
}
Expand Down Expand Up @@ -2795,7 +2798,7 @@ else if (className.equals("long") || className.equals("java.lang.Long") || class
}
else if (className.equals("string") || className.indexOf("java.lang.String") != -1)
{
return objStr.equals("null") ? "" : objStr;
return objStr.equals("null") ? null : objStr;
}
else if (className.equals("double") || className.equals("java.lang.Double") || className.equals("[D"))
{
Expand Down Expand Up @@ -2831,7 +2834,7 @@ else if (className.equals("boolean") || className.equals("java.lang.Boolean") ||
{
try
{
return objStr.equals("null") ? false : Boolean.valueOf(objStr);
return objStr.equals("null") ? null : Boolean.valueOf(objStr);
}
catch(Exception e)
{
Expand Down
8 changes: 7 additions & 1 deletion common/src/main/java/com/genexus/xml/GXXMLSerializable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,11 @@ else if (!currObj.equals(""))
}
}
if (setClass != null)
setMethod.invoke(this, new Object[] { convertValueToParmType(currObj, setClass) });
{
Object parmType = convertValueToParmType(currObj, setClass);
if (parmType != null)
setMethod.invoke(this, new Object[] { parmType });
}
}
}
catch (java.lang.ClassCastException ex)
Expand All @@ -419,6 +423,8 @@ private Object convertValueToParmType(Object value, Class parmClass) throws Exce
{
if (parmClass.getName().equals("java.util.Date"))
{
if (value.toString().equals("null"))
return null;
return localUtil.ctot(value.toString(), 0);
}
return CommonUtil.convertObjectTo(value, parmClass);
Expand Down
15 changes: 5 additions & 10 deletions common/src/main/java/json/org/json/JSONObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -901,16 +901,11 @@ public JSONObject put(String key, Object value) throws JSONException {
if (key == null) {
throw new JSONException("Null key.");
}
if (value != null) {
testValidity(value);
if (!has(key))
{
this.nameIndexList.add(key);
}
this.myHashMap.put(key, value);
} else {
remove(key);
}
testValidity(value);
if (!has(key)) {
this.nameIndexList.add(key);
}
this.myHashMap.put(key, value);
return this;
}

Expand Down
6 changes: 3 additions & 3 deletions java/src/test/java/com/genexus/TestCommonUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ public void testConvertObjectTo() {
try{
Class integerClass = Class.forName("java.lang.Integer");
result = CommonUtil.convertObjectTo(obj, integerClass, true);
Assert.assertEquals(Integer.valueOf("0"), result);
Assert.assertEquals(null, result);
} catch (Exception e){
Assert.fail("Test failed " + e);
}
Expand All @@ -254,7 +254,7 @@ public void testConvertObjectTo() {
try{
Class stringClass = Class.forName("java.lang.String");
result = CommonUtil.convertObjectTo(obj, stringClass, true);
Assert.assertEquals("", result);
Assert.assertEquals(null, result);
} catch (Exception e){
Assert.fail("Test failed " + e);
}
Expand Down Expand Up @@ -294,7 +294,7 @@ public void testConvertObjectTo() {
try{
Class booleanClass = Class.forName("java.lang.Boolean");
result = CommonUtil.convertObjectTo(obj, booleanClass, true);
Assert.assertEquals(false, result);
Assert.assertEquals(null, result);
} catch (Exception e){
Assert.fail("Test failed " + e);
}
Expand Down