Merge branch 'master' into totp_eo

Author: sgrampone

.github/workflows/Build.yml

@@ -55,7 +55,7 @@ jobs:
         servers: '[
           { "id": "github-genexuslabs", "username": "genexusbot", "password": "${{ secrets.SECURE_TOKEN }}" },
           { "id": "azure-devops", "username": "genexuslabs", "password": "${env.AZURE_ARTIFACTS_TOKEN}" },
-          { "id": "ossrh", "username": "${env.MAVEN_USERNAME}", "password": "${env.MAVEN_PASSWORD}" },
+          { "id": "central", "username": "${env.MAVEN_USERNAME}", "password": "${env.MAVEN_PASSWORD}" },
           { "id": "gpg.passphrase", "passphrase": "${env.MAVEN_GPG_PASSPHRASE}" }
         ]'
 

README.md

@@ -4,8 +4,8 @@ These are the source of the GeneXus Standard Classes for Java, valid since GeneX
 ## Repo Status
 | Branch | Build | Security
 |---|---|---
-|master |[![](https://github.com/genexuslabs/JavaClasses/workflows/Build/badge.svg)](https://github.com/genexuslabs/JavaClasses/actions?query=workflow%3ABuild+branch%3Amaster)|[![CodeQL](https://github.com/genexuslabs/JavaClasses/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/genexuslabs/JavaClasses/actions/workflows/codeql-analysis.yml)
-|beta   |[![](https://github.com/genexuslabs/JavaClasses/workflows/Build/badge.svg?branch=beta)](https://github.com/genexuslabs/JavaClasses/actions?query=workflow%3ABuild+branch%3Abeta)|[![CodeQL](https://github.com/genexuslabs/JavaClasses/actions/workflows/codeql-analysis.yml/badge.svg?branch=beta)](https://github.com/genexuslabs/JavaClasses/actions/workflows/codeql-analysis.yml)
+|master |[![Build](https://github.com/genexuslabs/JavaClasses/actions/workflows/Build.yml/badge.svg)](https://github.com/genexuslabs/JavaClasses/actions/workflows/Build.yml)|[![CodeQL](https://github.com/genexuslabs/JavaClasses/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/genexuslabs/JavaClasses/actions/workflows/codeql-analysis.yml)
+|beta   |[![Build](https://github.com/genexuslabs/JavaClasses/actions/workflows/Build.yml/badge.svg?branch=beta)](https://github.com/genexuslabs/JavaClasses/actions/workflows/Build.yml)|[![CodeQL](https://github.com/genexuslabs/JavaClasses/actions/workflows/codeql-analysis.yml/badge.svg?branch=beta)](https://github.com/genexuslabs/JavaClasses/actions/workflows/codeql-analysis.yml)
 
 ## Modules
 
@@ -21,10 +21,16 @@ These are the source of the GeneXus Standard Classes for Java, valid since GeneX
 | gxoffice                       | Formerly Java classes are now separated to be included only when using office. 
 | gxsearch                       | Formerly in Java classes are now separated to be included only when using search.
 | gxandroidpublisher and javapns | They are necessary for when you have Push Notifications in your old implementation. These are projects that should disappear in the short term.
-| android                        | The standard Android classes. **Note that this is not the full runtime for Android, the full runtime can be created by using the Android Flexible Client project**.
-| gxexternalproviders            | Implements service provider for IBM Cloud, Google, Azure, Amazon
-| gxgeospatial                   | Geography data type implementation
-| gxodata                        | OData access
+| android | The standard Android classes. **Note that this is not the full runtime for Android, the full runtime can be created by using the Android Flexible Client project**.
+| gxexternalproviders | Implements service provider for IBM Cloud, Google, Azure, Amazon
+| gxgeospatial | Geography data type implementation
+| gxodata | OData access
+| securityapicommons | SecurityAPI's common module
+| gxcryptography | SecurityAPI's GeneXusCryptography module
+| gxjwt | SecurityAPI's GeneXusJWT module
+| gxxmlsignature | SecurityAPI's GeneXusXmlSignature module
+| gxftps | SecurityAPI's GeneXusFTPS module
+| gxsftp | SecurityAPI's GeneXusSFTP module
 | gamtotp                        | GAM external object for RFC6238 implementation
 
 The dependencies between the projects are specified in each pom.xml within their directory.

android/src/main/java/com/genexus/db/DataStoreProvider.java

@@ -2,6 +2,7 @@
 
 import java.sql.SQLException;
 import java.util.Date;
+import java.util.concurrent.locks.ReentrantLock;
 
 import com.genexus.*;
 import com.genexus.db.driver.DataSource;
@@ -164,10 +165,54 @@ public void executeBatch(int cursorIdx)
 	{
             execute(cursorIdx, null, false);
 	}
+
+	static ReentrantLock lockExecute = new ReentrantLock();
+
 	public synchronized void execute(int cursorIdx, Object[] parms)
 	{
-            execute(cursorIdx, parms, true);
-        }
+		DataSource ds = getDataSourceNoException();
+		if(ds!=null && ds.jdbcIntegrity==false)
+		{
+			// If the JDBC integrity is disabled (XBASE_TINT), SQLIte is in autocommit mode.
+			// we need to lock the execute method to avoid concurrency issues.
+			// for example, the postExecute method (select changes()) cause exception in Android SQLite.
+			// it happends with execute sql statements like from diferent threads, like using procedures submit.
+			Cursor cursor = cursors[cursorIdx];
+			if (cursor instanceof UpdateCursor) // if the cursor is an UpdateCursor, we need to lock the execute method.
+			{ 
+				AndroidLog.debug("execute UpdateCursor cursorIdx : " + cursorIdx);
+				long timeStampStart = System.currentTimeMillis();
+				lockExecute.lock();
+				long timeStampLock = System.currentTimeMillis();
+				AndroidLog.debug("START execute UpdateCursor afterlock cursorIdx: " + cursorIdx + " Waiting time ms: " + (timeStampLock - timeStampStart));
+				try
+				{
+        			// execute the cursor with the parameters.
+					execute(cursorIdx, parms, true);
+				}
+				finally
+				{
+					lockExecute.unlock();
+				}
+				long timeStampEnd = System.currentTimeMillis();
+				AndroidLog.debug("END execute UpdateCursor cursorIdx: " + cursorIdx+ " Execute time ms: " + (timeStampEnd - timeStampLock));
+			}
+			else
+			{
+				// if the cursor is not an UpdateCursor, we can execute it without locking.
+				long timeStampStart = System.currentTimeMillis();
+				execute(cursorIdx, parms, true);
+				long timeStampEnd = System.currentTimeMillis();
+				AndroidLog.debug("END execute cursorIdx: " + cursorIdx+ " Execute time ms: " + (timeStampEnd - timeStampStart));
+			}
+		}	
+		else
+		{
+			// default case, we execute the cursor with the parameters.
+			execute(cursorIdx, parms, true);
+		}
+
+    }
 
 	private void execute(int cursorIdx, Object[] parms, boolean preExecute)
 	{

android/src/main/java/com/genexus/db/ForEachCursor.java

@@ -217,6 +217,7 @@ public void setTimestamp(int index, java.sql.Timestamp value) throws SQLExceptio
 	    public void setBLOBFile(int index, String fileName) throws SQLException {}
 	    public void setBLOBFile(int index, String fileName, boolean isMultiMedia) throws SQLException {}
 		public void setBLOBFile(int index, String fileName, boolean isMultiMedia, boolean downloadContent) throws SQLException {}
+		public void setEmbedding(int index, Float[] value) throws SQLException {}
 
 		public void setVarchar(int index, String value, int length, boolean allowsNull) throws SQLException {}
 	    public void setLongVarchar(int index, String value, boolean allowsNull) throws SQLException {}

android/src/main/java/com/genexus/db/SQLAndroidSQLiteHelper.java

@@ -5,7 +5,7 @@
 
 public class SQLAndroidSQLiteHelper 
 {
-	   private static String clazzFullName = "com.artech.layers.LocalUtils";
+	   private static String clazzFullName = "com.genexus.android.core.layers.LocalUtils";
 
 	   public static void beginTransaction()
 	    {

android/src/main/java/com/genexus/db/driver/GXCallableStatement.java

@@ -651,6 +651,11 @@ public byte[] getBytes(int columnIndex) throws SQLException
 		return stmt.getBytes(columnIndex);
 	}
 
+	public Float[] getGxembedding (int columnIndex) throws SQLException
+	{
+		return null;
+	}
+
 	public java.util.UUID getGUID(int columnIndex) throws SQLException
 	{
 		if	(DEBUG)

android/src/main/java/com/genexus/db/driver/GXPreparedStatement.java

@@ -1307,7 +1307,9 @@ else if (file.exists() && !fileNameNew.startsWith(blobBasePath))
 			}
 		}
 	}
-	
+
+	public void setEmbedding(int index, Float[] value) throws SQLException{
+	}
     public void setBinaryStream(int index, java.io.InputStream value, int length) throws SQLException
 	{
 		if	(DEBUG)

android/src/main/java/com/genexus/db/driver/GXResultSet.java

@@ -770,6 +770,11 @@ public byte[] getBytes(int columnIndex) throws SQLException
 		return result.getBytes(columnIndex);
 	}
 
+	public Float[] getGxembedding (int columnIndex) throws SQLException
+	{
+		return null;
+	}
+
 	public java.util.UUID getGUID(int columnIndex) throws SQLException
 	{
 		java.util.UUID value;

android/src/main/java/com/genexus/internet/HttpContext.java

@@ -414,7 +414,7 @@ public void SendState()
                 }catch(Exception ex){}
                 writeTextNL("<script type=\"text/javascript\">gx.http.useBase64State=true;</script>");
             }
-            writeText("<div><input type=\"hidden\" name=\"GXState\" value='");
+            writeText("<div><input type=\"hidden\" name=\"GXState\" data-gtm-ignore='true' value='");
             writeTextNL("'" + htmlEndTag(HTMLElement.INPUT) + "</div>");
             if (this.formCaption != null && !this.formCaption.equals(""))
             {

android/src/main/java/com/genexus/specific/android/AndroidJSONSerialization.java

@@ -9,6 +9,7 @@
 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<>();
@@ -24,4 +25,15 @@ public Iterator<Map.Entry<String, Object>> getJSONObjectIterator(JSONObjectWrapp
 	public JSONTokener getJSONTokener(String s) {
 		return new AndroidJSONTokenerWrapper(s);
 	}
+
+	@Override
+	public Map<String, Object> getJSONObjectMap(JSONObjectWrapper obj) {
+		Map<String, Object> map = new LinkedHashMap<>();
+		for (Iterator<String> it = obj.keys(); it.hasNext(); ) {
+			String k = it.next();
+			map.put(k, obj.get(k)); // add key and value to map result
+		}
+		return map;
+		
+	}
 }