Remove org.json lib fork and use new version of the API https://github.com/stleary/JSON-java

Issue: 105607

Author: iroqueta

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

@@ -16,10 +16,10 @@
 import com.genexus.internet.IGxJSONAble;
 import com.genexus.internet.IGxJSONSerializable;
 import com.genexus.internet.StringCollection;
+import com.genexus.json.JSONArrayWrapper;
 import com.genexus.util.GXMap;
 import com.genexus.util.Quicksort;
 import com.genexus.xml.XMLReader;
-
 import com.genexus.xml.XMLWriter;
 
 import org.json.JSONArray;
@@ -33,7 +33,7 @@ public class GXSimpleCollection<T> extends GXBaseList<T> {
 	protected String xmlElementsName;
 	protected String containedXmlNamespace = "";
 	protected int remoteHandle = -1;
-	protected JSONArray jsonArr = new JSONArray();
+	protected JSONArrayWrapper jsonArr = new JSONArrayWrapper();
 
 	public GXSimpleCollection()
 	{
@@ -979,7 +979,7 @@ public void tojson()
 	}
 	public void tojson(boolean includeState)
 	{
-		jsonArr = new JSONArray();
+		jsonArr = new JSONArrayWrapper();
 		int size = size();
 		for (int i = 0; i < size; i++)
 		{
@@ -1118,7 +1118,7 @@ public boolean fromJSonString(String s, GXBaseCollection<SdtMessages_Message> me
 	{
 		try
 		{
-			jsonArr = new JSONArray(s);
+			jsonArr = new JSONArrayWrapper(s);
 			FromJSONObject(jsonArr);
 			return true;
 		}
@@ -1144,7 +1144,7 @@ public void fromStringCollectionJsonString(String s)
 		this.clear();
 		try
 		{
-			jsonArr = new JSONArray(s);
+			jsonArr = new JSONArrayWrapper(s);
 			for (int i = 0; i < jsonArr.length(); i++)
 			{
 				JSONArray jsonObj = jsonArr.getJSONArray(i);
@@ -1224,7 +1224,7 @@ public void fromStringCollectionClientJsonString(String s)
 	{
 		this.clear();
 		try {
-			jsonArr = new JSONArray(s);
+			jsonArr = new JSONArrayWrapper(s);
 		} catch (JSONException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
@@ -1291,7 +1291,7 @@ private boolean processArray(GxUnknownObjectCollection oldParent, GxUnknownObjec
 
 	public JSONArray getRawJSONArray()
 	{
-		return jsonArr;
+		return (JSONArray)jsonArr;
 	}
 
 	// toString of GxUnknownObjectCollection as client proc expect, table info + rows.

common/src/main/java/com/genexus/json/JSONArrayWrapper.java

@@ -0,0 +1,20 @@
+package com.genexus.json;
+
+import org.json.JSONArray;
+
+import java.util.LinkedHashMap;
+
+public class JSONArrayWrapper extends JSONArray implements java.io.Serializable{
+
+	public JSONArrayWrapper() {
+		super();
+	}
+
+	public JSONArrayWrapper(String string) {
+		super(string);
+	}
+
+	public JSONArrayWrapper(JSONArray array) {
+		super(array);
+	}
+}

common/src/main/java/com/genexus/json/JSONObjectWrapper.java

@@ -5,7 +5,7 @@
 import java.util.Map.Entry;
 import org.json.JSONException;
 import org.json.JSONObject;
-public class JSONObjectWrapper extends JSONObject{
+public class JSONObjectWrapper extends JSONObject implements java.io.Serializable{
 	private Map<String, Object> map;
 
 	public JSONObjectWrapper() {

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

@@ -3,12 +3,13 @@
 import com.genexus.common.classes.AbstractGXFile;
 import com.genexus.ModelContext;
 import com.genexus.common.interfaces.SpecificImplementation;
+import com.genexus.json.JSONArrayWrapper;
+import com.genexus.json.JSONObjectWrapper;
 import com.genexus.util.GXProperties;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import com.genexus.json.JSONObjectWrapper;
 
 import java.io.Serializable;
 import java.util.Iterator;
@@ -40,7 +41,7 @@ public GXXMLSerializable(int remoteHandle, ModelContext context, String type)
 	private static final String GET_METHOD_NAME = "getgxTv_";
 	private static final String SET_METHOD_NAME = "setgxTv_";
 	private JSONObjectWrapper jsonObj = new JSONObjectWrapper();
-	private JSONArray jsonArr = new JSONArray();
+	private JSONArrayWrapper jsonArr = new JSONArrayWrapper();
 	protected boolean isArrayObject = false;
 	protected String arrayItemName;
 	protected String type;
@@ -240,7 +241,11 @@ public void AddObjectProperty(String name, Object prop, boolean includeState, bo
 				}
 				else if (isArrayObject)
 				{
-					jsonArr = (JSONArray)((IGxJSONAble)prop).GetJSONObject(includeState);
+					Object obj = ((IGxJSONAble)prop).GetJSONObject(includeState);
+					if (obj instanceof JSONArrayWrapper)
+						jsonArr = (JSONArrayWrapper)obj;
+					else
+						jsonArr = new JSONArrayWrapper((JSONArray)obj);
 				}
 				else
 				{