Add support for native web workloads for AWS

Fix Azure web support after refactoring classes

Author: olegz

spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSCompanionAutoConfiguration.java

@@ -21,6 +21,7 @@
 import org.springframework.cloud.function.json.JacksonMapper;
 import org.springframework.cloud.function.json.JsonMapper;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.util.CollectionUtils;
 
@@ -31,7 +32,8 @@
  * @since 3.2
  *
  */
-public class AWSCompanionAutoConfiguration  {
+@Configuration
+public class AWSCompanionAutoConfiguration {
 
 	@Bean
 	public AWSTypesMessageConverter awsTypesMessageConverter(GenericApplicationContext applicationContext) {

spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java

@@ -495,44 +495,44 @@ public class FunctionInvokerTests {
 			"    \"isBase64Encoded\": false\n" +
 			"}";
 
-	String s3Event = "{\n" +
-			"   \"Records\":[\n" +
-			"      {\n" +
-			"         \"eventVersion\":\"2.1\",\n" +
-			"         \"eventSource\":\"aws:s3\",\n" +
-			"         \"awsRegion\":\"us-east-2\",\n" +
-			"         \"eventTime\":\"2020-07-15T21:29:41.365Z\",\n" +
-			"         \"eventName\":\"ObjectCreated:Put\",\n" +
-			"         \"userIdentity\":{\n" +
-			"            \"principalId\":\"AWS:AIxxx\"\n" +
-			"         },\n" +
-			"         \"requestParameters\":{\n" +
-			"            \"sourceIPAddress\":\"xxxx\"\n" +
-			"         },\n" +
-			"         \"responseElements\":{\n" +
-			"            \"x-amz-request-id\":\"xxxx\",\n" +
-			"            \"x-amz-id-2\":\"xxx/=\"\n" +
-			"         },\n" +
-			"         \"s3\":{\n" +
-			"            \"s3SchemaVersion\":\"1.0\",\n" +
-			"            \"configurationId\":\"New Data Delivery\",\n" +
-			"            \"bucket\":{\n" +
-			"               \"name\":\"bucket\",\n" +
-			"               \"ownerIdentity\":{\n" +
-			"                  \"principalId\":\"xxx\"\n" +
-			"               },\n" +
-			"               \"arn\":\"arn:aws:s3:::bucket\"\n" +
-			"            },\n" +
-			"            \"object\":{\n" +
-			"               \"key\":\"test/file.geojson\",\n" +
-			"               \"size\":32711,\n" +
-			"               \"eTag\":\"aaaa\",\n" +
-			"               \"sequencer\":\"aaaa\"\n" +
-			"            }\n" +
-			"         }\n" +
-			"      }\n" +
-			"   ]\n" +
-			"}";
+	String s3Event = "{\n"
+			+ "    \"Records\": [\n"
+			+ "        {\n"
+			+ "            \"eventVersion\": \"2.1\",\n"
+			+ "            \"eventSource\": \"aws:s3\",\n"
+			+ "            \"awsRegion\": \"eu-central-1\",\n"
+			+ "            \"eventTime\": \"2023-11-04T23:44:23.905Z\",\n"
+			+ "            \"eventName\": \"ObjectCreated:Put\",\n"
+			+ "            \"userIdentity\": {\n"
+			+ "                \"principalId\": \"AWS:xxxxxxxxxxxxxxxxxxx\"\n"
+			+ "            },\n"
+			+ "            \"requestParameters\": {\n"
+			+ "                \"sourceIPAddress\": \"x.x.x.x\"\n"
+			+ "            },\n"
+			+ "            \"responseElements\": {\n"
+			+ "                \"x-amz-request-id\": \"xxxxxxxxxxxxxxxx\",\n"
+			+ "                \"x-amz-id-2\": \"xxxxxxxxxxxxxxxxxxxx\"\n"
+			+ "            },\n"
+			+ "            \"s3\": {\n"
+			+ "                \"s3SchemaVersion\": \"1.0\",\n"
+			+ "                \"configurationId\": \"xxxxxxxxxxxxxxxxxxxxxxxx\",\n"
+			+ "                \"bucket\": {\n"
+			+ "                    \"name\": \"xxxxxxxxxxxxxxx\",\n"
+			+ "                    \"ownerIdentity\": {\n"
+			+ "                        \"principalId\": \"xxxxxxxxxxxxxxxxxx\"\n"
+			+ "                    },\n"
+			+ "                    \"arn\": \"arn:aws:s3:::xxxxxxxxxxxxxxxxx\"\n"
+			+ "                },\n"
+			+ "                \"object\": {\n"
+			+ "                    \"key\": \"xxxxxxxxxxxxxxxx\",\n"
+			+ "                    \"size\": 6064,\n"
+			+ "                    \"eTag\": \"xxxxxxxxxxxxx\",\n"
+			+ "                    \"sequencer\": \"xxxxxxxxxxxxxx\"\n"
+			+ "                }\n"
+			+ "            }\n"
+			+ "        }\n"
+			+ "    ]\n"
+			+ "}";
 
 	String apiGatewayEventWithStructuredBody = "{\n" +
 			"    \"resource\": \"/uppercase2\",\n" +
@@ -1187,6 +1187,7 @@ public void handleRequest(InputStream input, OutputStream output, Context contex
 	@SuppressWarnings("rawtypes")
 	@Test
 	public void testApiGatewayV2Event() throws Exception {
+		System.out.println(this.apiGatewayV2Event);
 		System.setProperty("MAIN_CLASS", ApiGatewayConfiguration.class.getName());
 		System.setProperty("spring.cloud.function.definition", "inputApiV2Event");
 		FunctionInvoker invoker = new FunctionInvoker();

spring-cloud-function-adapters/spring-cloud-function-adapter-azure-web/pom.xml

@@ -57,19 +57,10 @@
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 </project>

spring-cloud-function-adapters/spring-cloud-function-adapter-azure-web/src/main/java/org/springframework/cloud/function/adapter/azure/web/AzureWebProxyInvoker.java

@@ -37,9 +37,9 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.springframework.cloud.function.serverless.web.ProxyHttpServletRequest;
-import org.springframework.cloud.function.serverless.web.ProxyHttpServletResponse;
-import org.springframework.cloud.function.serverless.web.ProxyMvc;
+import org.springframework.cloud.function.serverless.web.ServerlessHttpServletRequest;
+import org.springframework.cloud.function.serverless.web.ServerlessHttpServletResponse;
+import org.springframework.cloud.function.serverless.web.ServerlessMVC;
 import org.springframework.cloud.function.utils.FunctionClassUtils;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
@@ -58,10 +58,11 @@ public class AzureWebProxyInvoker implements FunctionInstanceInjector {
 	private static final String AZURE_WEB_ADAPTER_ROUTE = AZURE_WEB_ADAPTER_NAME
 			+ "/{e?}/{e2?}/{e3?}/{e4?}/{e5?}/{e6?}/{e7?}/{e8?}/{e9?}/{e10?}/{e11?}/{e12?}/{e13?}/{e14?}/{e15?}";
 
-	private ProxyMvc mvc;
+	private ServerlessMVC mvc;
 
 	private ServletContext servletContext;
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public <T> T getInstance(Class<T> functionClass) throws Exception {
 		this.initialize();
@@ -77,7 +78,7 @@ private void initialize() throws ServletException {
 		synchronized (AzureWebProxyInvoker.class.getName()) {
 			if (mvc == null) {
 				Class<?> startClass = FunctionClassUtils.getStartClass();
-				this.mvc = ProxyMvc.INSTANCE(startClass);
+				this.mvc = ServerlessMVC.INSTANCE(startClass);
 			}
 		}
 	}
@@ -88,7 +89,7 @@ private HttpServletRequest prepareRequest(HttpRequestMessage<Optional<String>> r
 
 		String path = request.getUri().getPath().substring(pathOffset);
 
-		ProxyHttpServletRequest httpRequest = new ProxyHttpServletRequest(servletContext,
+		ServerlessHttpServletRequest httpRequest = new ServerlessHttpServletRequest(servletContext,
 				request.getHttpMethod().toString(), path);
 
 
@@ -122,7 +123,7 @@ public HttpResponseMessage execute(
 
 		HttpServletRequest httpRequest = this.prepareRequest(request);
 
-		ProxyHttpServletResponse httpResponse = new ProxyHttpServletResponse();
+		ServerlessHttpServletResponse httpResponse = new ServerlessHttpServletResponse();
 		try {
 			this.mvc.service(httpRequest, httpResponse);
 

spring-cloud-function-adapters/spring-cloud-function-adapter-azure-web/src/test/java/org/springframework/cloud/function/adapter/azure/web/PetStoreSpringAppConfig.java

@@ -24,6 +24,7 @@
 import jakarta.servlet.ServletRequest;
 import jakarta.servlet.ServletResponse;
 
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -32,6 +33,7 @@
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
 
+@EnableAutoConfiguration
 @Configuration
 @Import({ PetsController.class })
 public class PetStoreSpringAppConfig {

spring-cloud-function-adapters/spring-cloud-function-serverless-web/pom.xml

@@ -48,6 +48,12 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
+			<exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

spring-cloud-function-adapters/spring-cloud-function-serverless-web/src/main/java/org/springframework/cloud/function/serverless/web/AWSTypesProcessor.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright 2024-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.function.serverless.web;
+
+import org.springframework.aot.generate.GenerationContext;
+import org.springframework.aot.hint.MemberCategory;
+import org.springframework.aot.hint.RuntimeHints;
+import org.springframework.beans.factory.aot.BeanFactoryInitializationAotContribution;
+import org.springframework.beans.factory.aot.BeanFactoryInitializationAotProcessor;
+import org.springframework.beans.factory.aot.BeanFactoryInitializationCode;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.ResponseEntity;
+
+/**
+ * Ensure that Function/Consumer input types are reflectively available.
+ *
+ * @author Oleg Zhurakousky
+ */
+public class AWSTypesProcessor implements BeanFactoryInitializationAotProcessor {
+
+	@Override
+	public BeanFactoryInitializationAotContribution processAheadOfTime(ConfigurableListableBeanFactory beanFactory) {
+		return new ReflectiveProcessorBeanFactoryInitializationAotContribution();
+	}
+
+	private static final class ReflectiveProcessorBeanFactoryInitializationAotContribution implements BeanFactoryInitializationAotContribution {
+		@Override
+		public void applyTo(GenerationContext generationContext, BeanFactoryInitializationCode beanFactoryInitializationCode) {
+			RuntimeHints runtimeHints = generationContext.getRuntimeHints();
+			// known static types
+			runtimeHints.reflection().registerType(HttpEntity.class,
+					MemberCategory.INVOKE_PUBLIC_METHODS, MemberCategory.INVOKE_DECLARED_CONSTRUCTORS);
+			runtimeHints.reflection().registerType(ResponseEntity.class,
+					MemberCategory.INVOKE_PUBLIC_METHODS, MemberCategory.INVOKE_DECLARED_CONSTRUCTORS);
+		}
+
+	}
+}

spring-cloud-function-adapters/spring-cloud-function-serverless-web/src/main/java/org/springframework/cloud/function/serverless/web/ProxyErrorController.java

@@ -36,11 +36,11 @@
 import org.springframework.web.util.WebUtils;
 
 /**
- * Implementation of Async context for {@link ProxyMvc}.
+ * Implementation of Async context for {@link ServerlessMVC}.
  *
  * @author Oleg Zhurakousky
  */
-public class ProxyAsyncContext implements AsyncContext {
+public class ServerlessAsyncContext implements AsyncContext {
 	private final HttpServletRequest request;
 
 	@Nullable
@@ -56,7 +56,7 @@ public class ProxyAsyncContext implements AsyncContext {
 	private final List<Runnable> dispatchHandlers = new ArrayList<>();
 
 
-	public ProxyAsyncContext(ServletRequest request, @Nullable ServletResponse response) {
+	public ServerlessAsyncContext(ServletRequest request, @Nullable ServletResponse response) {
 		this.request = (HttpServletRequest) request;
 		this.response = (HttpServletResponse) response;
 	}
@@ -87,7 +87,7 @@ public ServletResponse getResponse() {
 
 	@Override
 	public boolean hasOriginalRequestAndResponse() {
-		return (this.request instanceof ProxyHttpServletRequest && this.response instanceof ProxyHttpServletResponse);
+		return (this.request instanceof ServerlessHttpServletRequest && this.response instanceof ServerlessHttpServletResponse);
 	}
 
 	@Override
@@ -115,7 +115,7 @@ public String getDispatchedPath() {
 
 	@Override
 	public void complete() {
-		ProxyHttpServletRequest mockRequest = WebUtils.getNativeRequest(this.request, ProxyHttpServletRequest.class);
+		ServerlessHttpServletRequest mockRequest = WebUtils.getNativeRequest(this.request, ServerlessHttpServletRequest.class);
 		if (mockRequest != null) {
 			mockRequest.setAsyncStarted(false);
 		}