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

Issue: 97823

Author: iroqueta

common/src/main/java/com/genexus/CommonUtil.java

@@ -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);
+						}
 					}
 				}
             }
@@ -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"))
         {
@@ -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)
             {

common/src/main/java/com/genexus/xml/GXXMLSerializable.java

@@ -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)
@@ -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);

common/src/main/java/json/org/json/JSONObject.java

@@ -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;
     }
 

java/src/test/java/com/genexus/TestCommonUtil.java

@@ -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);
 		}
@@ -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);
 		}
@@ -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);
 		}