AWS Serverless: Add basic GAM support

android/src/main/java/com/genexus/diagnostics/core/provider/AndroidLogger.java

@@ -159,4 +159,7 @@ public void trace(String msg, Throwable ex) {
 		AndroidLog.debug(msg);	
 	}
 
+	public boolean isDebugEnabled() {
+		return true;
+	}
 }

common/src/main/java/com/genexus/diagnostics/core/ILogger.java

@@ -43,8 +43,7 @@ public interface ILogger {
 	void info(String[] list);
 
 	void info(String msg);
-
-
+
 	void trace(String msg);
 
 	void trace(Throwable ex, String[] list);
@@ -55,7 +54,8 @@ public interface ILogger {
 
 	void trace(String msg, Throwable ex);
 
-
+	boolean isDebugEnabled();
+
 	// Lambda Functions not supported JAVA 7. Only Java 8.
 	/*
 	 * public static void debug(Logger log, String startMsg, Func<String> buildMsg)

gxawsserverless/src/main/java/com/genexus/cloud/serverless/aws/AwsGxServletResponse.java

@@ -0,0 +1,21 @@
+package com.genexus.cloud.serverless.aws;
+
+import com.amazonaws.serverless.proxy.model.AwsProxyResponse;
+
+public class AwsGxServletResponse {
+	private AwsProxyResponse response;
+
+	public AwsGxServletResponse(AwsProxyResponse response){
+		this.response = response;
+	}
+	public AwsGxServletResponse(){
+	}
+
+	public boolean wasHandled(){
+		return response != null;
+	}
+
+	public AwsProxyResponse getAwsProxyResponse() {
+		return response;
+	}
+}

gxawsserverless/src/main/java/com/genexus/cloud/serverless/aws/LambdaHandler.java

@@ -4,13 +4,14 @@
 import javax.servlet.ServletContext;
 import javax.ws.rs.core.Application;
 
+import com.amazonaws.serverless.proxy.RequestReader;
 import com.amazonaws.serverless.proxy.internal.servlet.AwsHttpServletResponse;
 import com.amazonaws.serverless.proxy.internal.servlet.AwsProxyHttpServletRequest;
 import com.amazonaws.serverless.proxy.internal.servlet.AwsServletContext;
 import com.amazonaws.serverless.proxy.model.MultiValuedTreeMap;
+import com.genexus.specific.java.Connect;
 import com.genexus.specific.java.LogManager;
 import com.genexus.webpanels.GXWebObjectStub;
-import org.apache.logging.log4j.Logger;
 import org.glassfish.jersey.server.ResourceConfig;
 
 import com.amazonaws.serverless.proxy.jersey.JerseyLambdaContainerHandler;
@@ -34,6 +35,7 @@ public class LambdaHandler implements RequestHandler<AwsProxyRequest, AwsProxyRe
 	public static JerseyLambdaContainerHandler<AwsProxyRequest, AwsProxyResponse> handler = null;
 	private static ResourceConfig jerseyApplication = null;
 	private static final String BASE_REST_PATH = "/rest/";
+	private static  final String GX_APPLICATION_CLASS = "GXApplication";
 
 	public LambdaHandler() throws Exception {
 		if (LambdaHandler.jerseyApplication == null) {
@@ -48,28 +50,43 @@ public LambdaHandler() throws Exception {
 		}
 	}
 
-
 	@Override
 	public AwsProxyResponse handleRequest(AwsProxyRequest awsProxyRequest, Context context) {
-		dumpRequest(awsProxyRequest);
+		if (logger.isDebugEnabled()) {
+			dumpRequest(awsProxyRequest);
+		}
 		String path = awsProxyRequest.getPath();
-		awsProxyRequest.setPath(path.replace(BASE_REST_PATH, "/"));
-		handleSpecialMethods(awsProxyRequest);
+		prepareSpecialMethods(awsProxyRequest);
 		dumpRequest(awsProxyRequest);
 
 		logger.debug("Before handle Request");
+
+		awsProxyRequest.setPath(path.replace(BASE_REST_PATH, "/"));
 		AwsProxyResponse response = this.handler.proxy(awsProxyRequest, context);
+
+		//This code should be removed when GAM services get implemented via API Object.
+		if (response.getStatusCode() == 404) {
+			awsProxyRequest.setPath(path);
+			logger.debug("Trying servlet request: " + path);
+			AwsGxServletResponse servletResponse = handleServletRequest(awsProxyRequest, context);
+			if (servletResponse.wasHandled()){
+				response = servletResponse.getAwsProxyResponse();
+			}
+		}
+
 		int statusCode = response.getStatusCode();
 		logger.debug("After handle Request - Status Code: " + statusCode);
 
-		if (statusCode >= 400 && statusCode <= 599) {
+		if (statusCode >= 404 && statusCode <= 499) {
 			logger.warn(String.format("Request could not be handled (%d): %s", response.getStatusCode(), path));
 		}
 		return response;
 	}
 
-	private void handleSpecialMethods(AwsProxyRequest awsProxyRequest) {
-		if (awsProxyRequest.getPath().startsWith("/gxmulticall")) { //Gxmulticall does not respect queryString standard, so we need to transform.
+	private void prepareSpecialMethods(AwsProxyRequest awsProxyRequest) {
+		String path = awsProxyRequest.getPath();
+
+		if (path.startsWith("/gxmulticall")) { //Gxmulticall does not respect queryString standard, so we need to transform.
 			String parmValue = awsProxyRequest.getQueryString().replace("?", "").replace("=", "");
 			MultiValuedTreeMap<String, String> qString = new MultiValuedTreeMap<>();
 			qString.add("", parmValue);
@@ -86,13 +103,14 @@ private void handleSpecialMethods(AwsProxyRequest awsProxyRequest) {
 		}
 	}
 
-	private AwsProxyResponse handleServletRequest(AwsProxyRequest awsProxyRequest, Context context) {
+	private AwsGxServletResponse handleServletRequest(AwsProxyRequest awsProxyRequest, Context context) {
 		try {
 			GXWebObjectStub servlet = resolveServlet(awsProxyRequest);
 			if (servlet != null) {
 				CountDownLatch latch = new CountDownLatch(0);
-				ServletContext servletContext = new AwsServletContext(null);//AwsServletContext.getInstance(lambdaContext, null);
+				ServletContext servletContext = new AwsServletContext(null);
 				AwsProxyHttpServletRequest servletRequest = new AwsProxyHttpServletRequest(awsProxyRequest, context, null);
+				servletRequest.setAttribute(RequestReader.API_GATEWAY_CONTEXT_PROPERTY, awsProxyRequest.getRequestContext());
 				servlet.init(new ServletConfig() {
 					@Override
 					public String getServletName() {
@@ -117,14 +135,14 @@ public Enumeration<String> getInitParameterNames() {
 				AwsHttpServletResponse response = new AwsHttpServletResponse(servletRequest, latch);
 				servletRequest.setServletContext(servletContext);
 				servlet.service(servletRequest, response);
-				return new AwsProxyHttpServletResponseWriter().writeResponse(response, context);
+				return new AwsGxServletResponse(new AwsProxyHttpServletResponseWriter().writeResponse(response, context));
 			} else {
-				return new AwsProxyResponse(404);
+				return new AwsGxServletResponse(new AwsProxyResponse(404));
 			}
 		} catch (Exception e) {
 			logger.error("Error processing servlet request", e);
 		}
-		return new AwsProxyResponse(500);
+		return new AwsGxServletResponse();
 	}
 
 	private GXWebObjectStub resolveServlet(AwsProxyRequest awsProxyRequest) {
@@ -142,19 +160,20 @@ private GXWebObjectStub resolveServlet(AwsProxyRequest awsProxyRequest) {
 				handler = new GXOAuthUserInfo();
 				break;
 			default:
-				logger.error("Could not handle Servlet Path: " + path);
+				logger.debug("Could not handle Servlet Path: " + path);
 		}
 		return handler;
 	}
 
 	private static Application initialize() throws Exception {
 		logger = LogManager.initialize(".", LambdaHandler.class);
+		Connect.init();
 		IniFile config = com.genexus.ConfigFileFinder.getConfigFile(null, "client.cfg", null);
 		String className = config.getProperty("Client", "PACKAGE", null);
 		Class<?> cls;
 		try {
-			cls = Class.forName(className + ".GXApplication");
-			Application app = (Application) cls.newInstance();
+			cls = Class.forName(className.isEmpty() ? GX_APPLICATION_CLASS: String.format("%s.%s", className, GX_APPLICATION_CLASS));
+			Application app = (Application) cls.getDeclaredConstructor().newInstance();
 			ApplicationContext appContext = ApplicationContext.getInstance();
 			appContext.setServletEngine(true);
 			appContext.setServletEngineDefaultPath("");
@@ -174,4 +193,5 @@ private void dumpRequest(AwsProxyRequest awsProxyRequest){
 		reqData += String.format("Body: %sn", awsProxyRequest.getBody()) + lineSeparator;
 		logger.debug(reqData);
 	}
-}
+}
+

wrappercommon/src/main/java/com/genexus/diagnostics/core/provider/Log4J2Logger.java

@@ -216,6 +216,8 @@ public void trace(String msg, Throwable ex) {
 		}
 	}
 
-
+	public boolean isDebugEnabled() {
+		return log.isDebugEnabled();
+	}
 
 }