Remove org.json lib fork and use new version of the API https://githu… (

#865) * Remove org.json lib fork and use new version of the API https://github.com/stleary/JSON-java Issue: 105607 * Remove org.json lib fork and use new version of the API https://github.com/stleary/JSON-java Issue: 105607 * Remove org.json lib fork and use new version of the API https://github.com/stleary/JSON-java Issue: 105607 d844074 * Remove org.json lib fork and use new version of the API https://github.com/stleary/JSON-java Issue: 105607 d844074 * Remove org.json lib fork and use new version of the API https://github.com/stleary/JSON-java Issue: 105607 d844074 * Remove org.json lib fork and use new version of the API https://github.com/stleary/JSON-java Issue: 105607 d844074 * Remove org.json lib fork and use new version of the API https://github.com/stleary/JSON-java Issue: 105607 d844074 * Remove org.json lib fork and use new version of the API https://github.com/stleary/JSON-java Issue: 105607 d844074 * Remove org.json lib fork and use new version of the API https://github.com/stleary/JSON-java Issue: 105607 d844074 * Remove org.json lib fork and use new version of the API https://github.com/stleary/JSON-java Issue: 105607 d844074 * Remove org.json lib fork and use new version of the API https://github.com/stleary/JSON-java Issue: 105607 * Remove org.json lib fork and use new version of the API https://github.com/stleary/JSON-java Issue: 105607 * Remove org.json lib fork and use new version of the API https://github.com/stleary/JSON-java Issue: 105607 * Remove org.json lib fork and use new version of the API https://github.com/stleary/JSON-java Issue: 105607 * Remove org.json lib fork and use new version of the API https://github.com/stleary/JSON-java Issue: 105607 * Remove org.json lib fork and use new version of the API https://github.com/stleary/JSON-java Issue: 105607 * Remove org.json lib fork and use new version of the API https://github.com/stleary/JSON-java Issue: 105607 * Remove org.json lib fork and use new version of the API https://github.com/stleary/JSON-java Issue: 105607 * Remove org.json lib fork and use new version of the API https://github.com/stleary/JSON-java Issue: 105607 * Remove org.json lib fork and use new version of the API https://github.com/stleary/JSON-java Issue: 105607 * Remove org.json lib fork and use new version of the API https://github.com/stleary/JSON-java Issue: 105607 * Fix SDTs instantiation not working in offline Android procedures * Rename Iterator variables * Remove org.json lib fork and use new version of the API https://github.com/steary/JSON-java --------- Co-authored-by: Juan Pablo González <[email protected]>
genexuslabs · Nov 19, 2024 · 309497c · 309497c
1 parent 15891fb
commit 309497c
Show file tree

Hide file tree

Showing 89 changed files with 499 additions and 5,326 deletions.
diff --git a/android/src/main/java/com/artech/base/synchronization/bc/PendingEventHelper.java b/android/src/main/java/com/artech/base/synchronization/bc/PendingEventHelper.java
@@ -9,7 +9,7 @@
 import com.genexus.GxSilentTrnSdt;
 import com.genexus.IGxSilentTrn;
 
-import json.org.json.JSONArray;
+import org.json.JSONArray;
 
 public class PendingEventHelper {
 

diff --git a/android/src/main/java/com/artech/synchronization/ISynchronizationHelper.java b/android/src/main/java/com/artech/synchronization/ISynchronizationHelper.java
@@ -2,7 +2,7 @@
 
 import java.util.TreeMap;
 
-import json.org.json.JSONArray;
+import org.json.JSONArray;
 
 public interface ISynchronizationHelper {
 

diff --git a/android/src/main/java/com/genexus/GXutil.java b/android/src/main/java/com/genexus/GXutil.java
@@ -21,7 +21,7 @@
 import com.genexus.util.GXThreadLocal;
 import com.genexus.util.IThreadLocal;
 
-import json.org.json.JSONObject;
+import org.json.JSONObject;
 
 public final class GXutil
 {

diff --git a/android/src/main/java/com/genexus/db/driver/ExternalProviderMetadata.java b/android/src/main/java/com/genexus/db/driver/ExternalProviderMetadata.java
@@ -1,7 +1,7 @@
 package com.genexus.db.driver;
 
-import json.org.json.JSONException;
-import json.org.json.JSONObject;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 public class ExternalProviderMetadata
 {

diff --git a/android/src/main/java/com/genexus/internet/HttpAjaxContext.java b/android/src/main/java/com/genexus/internet/HttpAjaxContext.java
@@ -3,10 +3,9 @@
 import java.util.ArrayList;
 import java.util.Stack;
 
-import json.org.json.IJsonFormattable;
-import json.org.json.JSONArray;
-import json.org.json.JSONException;
-import json.org.json.JSONObject;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 public abstract class HttpAjaxContext
 {
@@ -497,7 +496,7 @@ public Object GetJSONObject()
 			return wrapper;
 		}
 
-		public void FromJSONObject(IJsonFormattable obj)
+		public void FromJSONObject(Object obj)
 		{
 		}
 

diff --git a/android/src/main/java/com/genexus/internet/HttpContext.java b/android/src/main/java/com/genexus/internet/HttpContext.java
@@ -13,10 +13,9 @@
 import com.genexus.util.Codecs;
 import com.genexus.util.Encryption;
 
-import json.org.json.IJsonFormattable;
-import json.org.json.JSONArray;
-import json.org.json.JSONException;
-import json.org.json.JSONObject;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 public abstract class HttpContext extends HttpAjaxContext implements IHttpContext
 {
@@ -613,7 +612,7 @@ public void ajax_req_read_hidden_sdt(String jsonStr, Object SdtObj)
         {
             try
             {
-                IJsonFormattable jsonObj;
+                Object jsonObj;
                 if (jsonStr.startsWith("["))
                     jsonObj = new JSONArray(jsonStr);
                 else

diff --git a/android/src/main/java/com/genexus/specific/android/AndroidJSONSerialization.java b/android/src/main/java/com/genexus/specific/android/AndroidJSONSerialization.java
@@ -0,0 +1,21 @@
+package com.genexus.specific.android;
+
+import com.genexus.common.interfaces.IExtensionJSONSerialization;
+import com.genexus.json.JSONObjectWrapper;
+
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public class AndroidJSONSerialization implements IExtensionJSONSerialization {
+	@Override
+	public Iterator<Map.Entry<String, Object>> getJSONObjectIterator(JSONObjectWrapper obj) {
+		Map<String, Object> map = new LinkedHashMap<>();
+		for (Iterator<String> it = obj.keys(); it.hasNext(); ) {
+			String k = it.next();
+			map.put(k, null); // value is not used for now, so we just set it as null
+		}
+
+		return map.entrySet().iterator();
+	}
+}
diff --git a/android/src/main/java/com/genexus/specific/android/Connect.java b/android/src/main/java/com/genexus/specific/android/Connect.java
@@ -3,11 +3,9 @@
 import java.util.Date;
 
 import com.genexus.common.interfaces.SpecificImplementation;
-import com.genexus.db.UserInformation;
 
-import json.org.json.IExtensionJSONObject;
-import json.org.json.JSONException;
-import json.org.json.JSONObject;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 public final class Connect {
 
@@ -34,35 +32,13 @@ public static void init()
 		// connect GXSilentTrn
 		SpecificImplementation.GXSilentTrnSdt = new GXSilentTrnSdt();
 		SpecificImplementation.SdtMessages_Message = new SdtMessages_Message();
+		SpecificImplementation.JsonSerialization = new AndroidJSONSerialization();
 
 		SpecificImplementation.KeepDecimals = true;
 		SpecificImplementation.MillisecondMask = "SSS";
 		SpecificImplementation.SupportPending = true;
 		SpecificImplementation.cdowMask = "EEEE";
 		SpecificImplementation.Base64Encode = "8859_1";
 		SpecificImplementation.UseUnicodeCharacterClass = false;
-		JSONObject.extension = new JSONObjectExtension();
-
 	}
-
-	 static class JSONObjectExtension implements IExtensionJSONObject {
-
-			@Override
-			public String dateToString(Date d) throws JSONException {
-				if (d == null) {
-			        throw new JSONException("Null pointer");
-			    }
-			    UserInformation ui = (UserInformation) com.genexus.GXObjectHelper.getUserInformation(new com.genexus.ModelContext(com.genexus.ModelContext.getModelContextPackageClass()), -1);
-			    com.genexus.LocalUtil localUtil = ui.getLocalUtil();
-			    String dateString = localUtil.format(d, localUtil.getDateFormat() + " " + localUtil.getTimeFormat());
-			    try
-			    {
-			    	com.genexus.db.DBConnectionManager.getInstance().disconnect(ui.getHandle());
-			    }
-			    catch (Throwable e)
-			    {}
-			    return dateString;
-			}
-
-		}
 }
diff --git a/common/pom.xml b/common/pom.xml
@@ -50,6 +50,11 @@
             <artifactId>opentelemetry-api</artifactId>
             <version>${io.opentelemetry.version}</version>
         </dependency>
+		<dependency>
+			<groupId>org.json</groupId>
+			<artifactId>json</artifactId>
+			<version>20231013</version>
+		</dependency>        
     </dependencies>
 
 	<build>

diff --git a/common/src/main/java/com/genexus/CommonUtil.java b/common/src/main/java/com/genexus/CommonUtil.java
@@ -4,7 +4,7 @@
 import com.genexus.diagnostics.core.LogManager;
 import com.genexus.util.*;
 
-import json.org.json.JSONObject;
+import org.json.JSONObject;
 
 import java.math.BigDecimal;
 import java.io.*;

diff --git a/common/src/main/java/com/genexus/GXBaseCollection.java b/common/src/main/java/com/genexus/GXBaseCollection.java
@@ -10,9 +10,10 @@
 import com.genexus.xml.GXXMLSerializer;
 import com.genexus.xml.XMLReader;
 import com.genexus.xml.XMLWriter;
+import com.genexus.json.JSONObjectWrapper;
 
-import json.org.json.IJsonFormattable;
-import json.org.json.JSONArray;
+import org.json.JSONArray;
+import org.json.JSONObject;
 
 public class GXBaseCollection<T extends GXXMLSerializable> extends GXSimpleCollection<T> {
 
@@ -223,15 +224,17 @@ public boolean add(T item)
 
 	@Override
 	@SuppressWarnings("unchecked")
-	public void FromJSONObject(IJsonFormattable obj)
+	public void FromJSONObject(Object obj)
 	{
 		this.clear();
 		JSONArray jsonArr = (JSONArray)obj;
 		for (int i = 0; i < jsonArr.length(); i++)
 		{
 			try
 			{
-				Object jsonObj = jsonArr.get(i);				
+				Object jsonObj = jsonArr.get(i);
+				if (jsonObj instanceof JSONObject)
+					jsonObj = new JSONObjectWrapper((JSONObject)jsonObj);
 				Class[] parTypes = new Class[] {};
 				Object[] arglist = new Object[] {};
 				if (elementsType == null)
@@ -251,7 +254,7 @@ public void FromJSONObject(IJsonFormattable obj)
 
 						Constructor<T> constructor = elementsType.getConstructor(parTypes);
 						currObj = constructor.newInstance(arglist);
-						((IGxJSONAble)currObj).FromJSONObject((IJsonFormattable)jsonObj);
+						((IGxJSONAble)currObj).FromJSONObject(jsonObj);
 					}
 					add((T)currObj);
 				}

diff --git a/common/src/main/java/com/genexus/GXSimpleCollection.java b/common/src/main/java/com/genexus/GXSimpleCollection.java
@@ -16,15 +16,14 @@
 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 json.org.json.IJsonFormattable;
-import json.org.json.JSONArray;
-import json.org.json.JSONException;
+import org.json.JSONArray;
+import org.json.JSONException;
 
 public class GXSimpleCollection<T> extends GXBaseList<T> {
 
@@ -34,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()
 	{
@@ -980,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++)
 		{
@@ -1031,7 +1030,7 @@ public Object GetJSONObject(boolean includeState)
 		tojson(includeState);
 		return jsonArr;
 	}
-	public void FromJSONObject(IJsonFormattable obj)
+	public void FromJSONObject(Object obj)
 	{
 
 		this.clear();
@@ -1059,7 +1058,7 @@ public void FromJSONObject(IJsonFormattable obj)
 					{
 						Constructor constructor = elementsType.getConstructor(parTypes);
 						currObj = constructor.newInstance(arglist);
-						((IGxJSONAble)currObj).FromJSONObject((IJsonFormattable)jsonObj);
+						((IGxJSONAble)currObj).FromJSONObject(jsonObj);
 					}
 					if (IGxJSONSerializable.class.isAssignableFrom(elementsType))
 					{
@@ -1119,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;
 		}
@@ -1145,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);
@@ -1225,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();
@@ -1292,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.
@@ -1317,7 +1316,7 @@ public String toStringCollectionClientJsonString()
 			result = result + ",[";
 			GxUnknownObjectCollection tableCollection = (GxUnknownObjectCollection)super.get(i);
 			int tableCollectionSize = tableCollection.size();
-			jsonObj = new json.org.json.JSONArray();
+			jsonObj = new JSONArray();
 			for (int j = 1; j <= tableCollectionSize; j++)
 			{
 				jsonObj.put((StringCollection)tableCollection.item(j));

diff --git a/common/src/main/java/com/genexus/common/interfaces/IExtensionJSONSerialization.java b/common/src/main/java/com/genexus/common/interfaces/IExtensionJSONSerialization.java
@@ -0,0 +1,10 @@
+package com.genexus.common.interfaces;
+
+import com.genexus.json.JSONObjectWrapper;
+
+import java.util.Iterator;
+import java.util.Map;
+
+public interface IExtensionJSONSerialization {
+	Iterator<Map.Entry<String, Object>> getJSONObjectIterator(JSONObjectWrapper obj);
+}
diff --git a/common/src/main/java/com/genexus/common/interfaces/IGXWebGrid.java b/common/src/main/java/com/genexus/common/interfaces/IGXWebGrid.java
@@ -1,6 +1,6 @@
 package com.genexus.common.interfaces;
 
-import json.org.json.JSONArray;
+import org.json.JSONArray;
 
 public interface IGXWebGrid {
 	Object GetJSONObject();

diff --git a/common/src/main/java/com/genexus/common/interfaces/SpecificImplementation.java b/common/src/main/java/com/genexus/common/interfaces/SpecificImplementation.java
@@ -27,6 +27,7 @@ public class SpecificImplementation {
 	public static IExtensionHTTPConnection					HTTPConnection;
 	public static ICryptoAlhorithms 						Algorithms;
 	public static IExtensionModelContext					ModelContext;
+	public static IExtensionJSONSerialization				JsonSerialization;
 	public static boolean KeepDecimals;
 	public static String MillisecondMask;
 	public static boolean SupportPending;

diff --git a/common/src/main/java/com/genexus/internet/GXHttpClient.java b/common/src/main/java/com/genexus/internet/GXHttpClient.java
@@ -4,8 +4,8 @@
 import HTTPClient.URI;
 import com.genexus.CommonUtil;
 import com.genexus.common.interfaces.SpecificImplementation;
-import json.org.json.JSONException;
-import json.org.json.JSONObject;
+import org.json.JSONException;
+import com.genexus.json.JSONObjectWrapper;
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -807,7 +807,7 @@ private String getContentTypeFromString(String value){
 
 		private boolean isJsonString(String value){
 			try {
-				JSONObject json = new JSONObject(value);
+				JSONObjectWrapper json = new JSONObjectWrapper(value);
 				return true;
 			} catch (JSONException e) {
 				return false;

diff --git a/common/src/main/java/com/genexus/internet/GXJSONObject.java b/common/src/main/java/com/genexus/internet/GXJSONObject.java
@@ -2,9 +2,9 @@
 
 import com.genexus.util.Codecs;
 
-import json.org.json.*;
+import com.genexus.json.JSONObjectWrapper;
 
-public class GXJSONObject extends JSONObject
+public class GXJSONObject extends JSONObjectWrapper
 {
 	private boolean base64Encoded;
 

diff --git a/common/src/main/java/com/genexus/internet/GXNavigationHelper.java b/common/src/main/java/com/genexus/internet/GXNavigationHelper.java
@@ -3,7 +3,7 @@
 import com.genexus.CommonUtil;
 import com.genexus.common.interfaces.SpecificImplementation;
 
-import json.org.json.*;
+import org.json.JSONArray;
 
 import java.io.Serializable;