Cherry pick branch 'genexuslabs:AzureFunctions' into beta

Author: sjuarez

gxazureserverless/src/main/java/com/genexus/cloud/serverless/azure/handler/AzureCosmosDBHandler.java

@@ -3,36 +3,32 @@
 import com.genexus.cloud.serverless.model.*;
 import com.microsoft.azure.functions.ExecutionContext;
 import com.microsoft.azure.functions.annotation.CosmosDBTrigger;
-import com.sun.jna.platform.win32.Guid;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class AzureCosmosDBHandler extends AzureEventHandler{
 
 	public AzureCosmosDBHandler() throws Exception {
 		super();
 	}
 	public void run(
-		@CosmosDBTrigger(name = "itemIn", databaseName = "%CosmosDB_Database_Name%", containerName = "%Container_Name%", leaseContainerName = "%lease_Container_Name%", connection = "%CosmosDB_Connection%") List<Map<String,Object>> items ,
+		@CosmosDBTrigger(name = "itemIn", databaseName = "%CosmosDB_Database_Name%", containerName = "%Container_Name%", leaseContainerName = "%lease_Container_Name%", connection = "connection") List<Object> items ,
 		final ExecutionContext context) throws Exception {
 
 		context.getLogger().info("GeneXus CosmosDB trigger handler. Function processed: " + context.getFunctionName() + " Invocation Id: " + context.getInvocationId());
 
-		Guid.GUID eventId = new Guid.GUID(context.getInvocationId());
-
+		UUID eventId = UUID.randomUUID();
 		EventMessages msgs = new EventMessages();
 		EventMessagesList eventMessagesList = new EventMessagesList();
 		String rawMessage= "";
 		setupServerlessMappings(context.getFunctionName());
 
 		switch (executor.getMethodSignatureIdx()) {
 			case 0:
-				msgs = setupEventMessages(eventId,items);
+				msgs = setupEventMessages(eventId,TryGetDocuments(items));
 				break;
 			case 4:
-				eventMessagesList = setupEventMessagesList(items);
+				eventMessagesList = setupEventMessagesList(TryGetDocuments(items));
 				break;
 			default:
 				rawMessage = JSONHelper.toJSONString(items);
@@ -50,6 +46,26 @@ public void run(
 		}
 	}
 
+	private List<Map<String,Object>> TryGetDocuments(List<Object> items){
+		List<Map<String,Object>> documents = new ArrayList<>();
+		if (items != null && !items.isEmpty()) {
+			for (Object item : items) {
+				if (item instanceof Map) {
+					try {
+						Map<String, Object> document = (Map<String, Object>) item;
+						documents.add(document);
+					}
+					catch (Exception ex)
+					{
+						logger.error(String.format("Messages were not handled. Error trying to read Cosmos DB data. %s", ex.toString()));
+						throw new RuntimeException(String.format("Error trying to read Cosmos DB data. %s", ex.toString())); //Throw the exception so the runtime can Retry the operation.
+					}
+				}
+			}
+			return documents;
+		}
+		return null;
+	}
 	private EventMessagesList setupEventMessagesList(List<Map<String,Object>> jsonList)
 	{
 		EventMessagesList messagesList = new EventMessagesList();
@@ -59,7 +75,7 @@ private EventMessagesList setupEventMessagesList(List<Map<String,Object>> jsonLi
 		return messagesList;
 	}
 
-	private EventMessages setupEventMessages(Guid.GUID eventId, List<Map<String,Object>> jsonList)
+	private EventMessages setupEventMessages(UUID eventId, List<Map<String,Object>> jsonList)
 	{
 		EventMessages msgs = new EventMessages();
 		for (Map<String, Object> json : jsonList) {

gxazureserverless/src/main/java/com/genexus/cloud/serverless/azure/handler/AzureQueueHandler.java

@@ -32,7 +32,7 @@ public void run(
 				msg.setMessageSourceType(EventMessageSourceType.QUEUE_MESSAGE);
 				try {
 					String sanitizedTime = insertionTime.replace("\"", "");
-					if (!sanitizedTime.endsWith("Z")) {
+					if (!sanitizedTime.endsWith("Z") && !sanitizedTime.matches(".*[+-]\\d{2}:\\d{2}$")) {
 						sanitizedTime += "Z";
 					}
 					Instant instant = Instant.from(Instant.parse(sanitizedTime));

gxazureserverless/src/main/java/com/genexus/cloud/serverless/helpers/ServiceBusSingleMessageProcessor.java

@@ -20,7 +20,7 @@ public ServiceBusProcessedMessage processQueueMessage(GXProcedureExecutor execut
 				msg.setMessageSourceType(EventMessageSourceType.SERVICE_BUS_MESSAGE);
 				try {
 					String sanitizedTime = enqueuedTimeUtc.replace("\"", "");
-					if (!sanitizedTime.endsWith("Z")) {
+					if (!sanitizedTime.endsWith("Z") && !sanitizedTime.matches(".*[+-]\\d{2}:\\d{2}$")) {
 						sanitizedTime += "Z";
 					}
 					Instant instant = Instant.from(Instant.parse(sanitizedTime));

gxazureserverless/src/test/java/com/genexus/cloud/azure/events/TestAzureCosmosDBHandler.java

@@ -15,12 +15,11 @@ public class TestAzureCosmosDBHandler {
 	private AzureCosmosDBHandler cosmosDBFunction;
 	private ExecutionContext context;
 
-
 	@Test
 	public void testCosmosDBFunction() throws Exception {
 
 		cosmosDBFunction = new AzureCosmosDBHandler();
-		List<Map<String, Object>> list = new ArrayList<>(2);
+		List<Object> list = new ArrayList<>(2);
 
 		Map<String, Object> map1 = new HashMap<>();
 		map1.put("UserId", "ac7f12fd-9784-4c93-94cd-7e02a7b1cf4b");