Merge branch 'master' into feat/update-snapshot-labels

Author: anaiberta

.github/workflows/Build.yml

@@ -187,6 +187,5 @@ jobs:
     with: 
       VERSION: ${{ needs.build.outputs.MAVEN_VERSION }}
       PACKAGE_NAMES: ${{ needs.build.outputs.PACKAGES_NAME }}
-      COMMIT_MESSAGE: ${{ needs.build.outputs.COMMIT_MESSAGE }}
       COMMITTER: ${{ needs.build.outputs.LAST_COMMITTER }}
     secrets: inherit

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 {
 

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 {
 

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
 {

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
 {

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)
 		{
 		}
 

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

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();
+	}
+}

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

android/src/main/java/com/genexus/util/GxJsonReader.java

@@ -5,7 +5,7 @@
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
 
-import org.apache.commons.lang.CharEncoding;
+import java.nio.charset.StandardCharsets;
 
 import com.genexus.internet.StringCollection;
 import com.google.gson.stream.JsonReader;
@@ -14,11 +14,7 @@ public class GxJsonReader {
 	private JsonReader reader;
 
 	public GxJsonReader(InputStream stream) {
-		try {
-			reader = new JsonReader(new InputStreamReader(stream, CharEncoding.UTF_8));
-		} catch (UnsupportedEncodingException e) {
-			//TODO
-		}
+		reader = new JsonReader(new InputStreamReader(stream, StandardCharsets.UTF_8));
 	}
 
 	public boolean readBeginArray() {