Java Azure functions (#881)

--------- Co-authored-by: Sabrina Juarez Garcia <[email protected]>
genexuslabs · Jan 9, 2025 · 08a4b8d · 08a4b8d
1 parent 03572ae
commit 08a4b8d
Show file tree

Hide file tree

Showing 85 changed files with 6,225 additions and 670 deletions.
diff --git a/gxawsserverless/pom.xml b/gxawsserverless/pom.xml
@@ -31,6 +31,12 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>gxserverlesscommon</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>

diff --git a/gxawsserverless/src/main/java/com/genexus/cloud/serverless/Helper.java b/gxawsserverless/src/main/java/com/genexus/cloud/serverless/Helper.java
diff --git a/...erless/src/main/java/com/genexus/cloud/serverless/aws/handler/LambdaBaseEventHandler.java b/...erless/src/main/java/com/genexus/cloud/serverless/aws/handler/LambdaBaseEventHandler.java
@@ -3,8 +3,7 @@
 import com.genexus.ApplicationContext;
 import com.genexus.ModelContext;
 import com.genexus.cloud.serverless.*;
-import com.genexus.cloud.serverless.model.EventMessageResponse;
-import com.genexus.cloud.serverless.model.EventMessages;
+import com.genexus.cloud.serverless.model.*;
 import com.genexus.diagnostics.core.ILogger;
 import com.genexus.specific.java.Connect;
 import com.genexus.specific.java.LogManager;
@@ -64,7 +63,7 @@ private void initialize() throws Exception {
 	}
 
 	protected EventMessageResponse dispatchEvent(EventMessages eventMessages, String lambdaRawMessageBody) throws Exception {
-		String jsonStringMessages = Helper.toJSONString(eventMessages);
+		String jsonStringMessages = JSONHelper.toJSONString(eventMessages);
 
 		if (logger.isDebugEnabled()) {
 			logger.debug(String.format("dispatchEventMessages (%s) - serialized messages: %s", functionConfiguration.getEntryPointClassName(), jsonStringMessages));
@@ -74,7 +73,7 @@ protected EventMessageResponse dispatchEvent(EventMessages eventMessages, String
 		EventMessageResponse response = null;
 
 		try {
-			response = executor.execute(modelContext, eventMessages, lambdaRawMessageBody);
+			response = executor.execute(modelContext, eventMessages, null, lambdaRawMessageBody);
 		} catch (Exception e) {
 			logger.error(String.format("dispatchEventmessages - program '%s' execution error", entryPointClass.getName()), e);
 			throw e;

diff --git a/...less/src/main/java/com/genexus/cloud/serverless/aws/handler/LambdaEventBridgeHandler.java b/...less/src/main/java/com/genexus/cloud/serverless/aws/handler/LambdaEventBridgeHandler.java
@@ -2,12 +2,9 @@
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
-import com.genexus.cloud.serverless.Helper;
+import com.genexus.cloud.serverless.JSONHelper;
+import com.genexus.cloud.serverless.model.*;
 import com.genexus.cloud.serverless.exception.FunctionRuntimeException;
-import com.genexus.cloud.serverless.model.EventMessage;
-import com.genexus.cloud.serverless.model.EventMessageResponse;
-import com.genexus.cloud.serverless.model.EventMessageSourceType;
-import com.genexus.cloud.serverless.model.EventMessages;
 import com.genexus.json.JSONObjectWrapper;
 import org.apache.http.client.utils.DateUtils;
 
@@ -25,7 +22,7 @@ public LambdaEventBridgeHandler(String entryPointClassName) throws Exception {
 
 	@Override
 	public String handleRequest(Map<String, Object> stringObjectMap, Context context) {
-		String jsonEventRaw = Helper.toJSONString(stringObjectMap);
+		String jsonEventRaw = JSONHelper.toJSONString(stringObjectMap);
 
 		logger.debug("handleRequest started with event: " + jsonEventRaw);
 
@@ -44,7 +41,7 @@ public String handleRequest(Map<String, Object> stringObjectMap, Context context
 				msgItem.setMessageData(new JSONObjectWrapper(jsonEventRaw).getJSONObject("detail").toString());
 			}
 			for (Map.Entry<String, Object> entry : stringObjectMap.entrySet()) {
-				Helper.addEventMessageProperty(msgItem, entry.getKey(), entry.getValue().toString());
+				JSONHelper.addEventMessageProperty(msgItem, entry.getKey(), entry.getValue().toString());
 			}
 			msgs.add(msgItem);
 			response = dispatchEvent(msgs, jsonEventRaw);
@@ -63,6 +60,6 @@ public String handleRequest(Map<String, Object> stringObjectMap, Context context
 			logger.error(String.format("Messages were not handled. Error: %s", response.getErrorMessage()));
 			throw new RuntimeException(response.getErrorMessage());
 		}
-		return Helper.toJSONString(response);
+		return JSONHelper.toJSONString(response);
 	}
 }
diff --git a/gxawsserverless/src/main/java/com/genexus/cloud/serverless/aws/handler/LambdaSQSHandler.java b/gxawsserverless/src/main/java/com/genexus/cloud/serverless/aws/handler/LambdaSQSHandler.java
@@ -6,11 +6,7 @@
 import com.amazonaws.services.lambda.runtime.events.SQSEvent;
 import com.amazonaws.services.lambda.runtime.events.SQSEvent.SQSMessage;
 import com.genexus.cloud.serverless.*;
-import com.genexus.cloud.serverless.model.EventMessageProperty;
-import com.genexus.cloud.serverless.model.EventMessage;
-import com.genexus.cloud.serverless.model.EventMessageResponse;
-import com.genexus.cloud.serverless.model.EventMessageSourceType;
-import com.genexus.cloud.serverless.model.EventMessages;
+import com.genexus.cloud.serverless.model.*;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -64,7 +60,7 @@ public SQSBatchResponse handleRequest(SQSEvent sqsEvent, Context context) {
 		String errorMessage;
 
 		try {
-			EventMessageResponse response = dispatchEvent(msgs, Helper.toJSONString(sqsEvent));
+			EventMessageResponse response = dispatchEvent(msgs, JSONHelper.toJSONString(sqsEvent));
 			wasHandled = !response.hasFailed();
 			errorMessage = response.getErrorMessage();
 		} catch (Exception e) {

diff --git a/...c/test/java/com/genexus/genexusserverlessapi/SdtEventCustomPayload_CustomPayloadItem.java b/...c/test/java/com/genexus/genexusserverlessapi/SdtEventCustomPayload_CustomPayloadItem.java