add further testing for v2 requests

Author: tobixlea

aws-serverless-java-container-springboot3/src/test/java/com/amazonaws/serverless/proxy/spring/AwsSpringHttpProcessingUtilsTests.java

@@ -223,6 +223,10 @@ public static Collection<String> v1Data() {
         return Arrays.asList(new String[]{API_GATEWAY_EVENT, ALB_EVENT});
     }
 
+    public static Collection<String> v2Data() {
+        return Arrays.asList(new String[]{API_GATEWAY_EVENT_V2});
+    }
+
     @MethodSource("data")
     @ParameterizedTest
 	public void validateHttpServletRequestGenerationWithInputStream(String jsonEvent) {
@@ -282,7 +286,7 @@ public void validateLambdaContextAttribute(String jsonEvent) {
 		assertNotNull(request.getAttribute(RequestReader.API_GATEWAY_EVENT_PROPERTY));
 	}
 
-	@MethodSource("v1Data")
+	@MethodSource("data")
 	@ParameterizedTest
 	public void validateSecurityContextAttribute(String jsonEvent) {
 		ServerlessServletContext servletContext = new ServerlessServletContext();
@@ -301,7 +305,7 @@ public void validateNullMultiValueHeaders(String jsonEvent) throws Exception {
 		assertNotNull(request);
 	}
 
-	@MethodSource("v1Data")
+	@MethodSource("data")
 	@ParameterizedTest
 	public void validateBase64EncodedBody(String jsonEvent) throws Exception {
 		String base64Body = java.util.Base64.getEncoder().encodeToString("test body".getBytes(StandardCharsets.UTF_8));
@@ -313,6 +317,30 @@ public void validateBase64EncodedBody(String jsonEvent) throws Exception {
 		HttpServletRequest request = AwsSpringHttpProcessingUtils.generateHttpServletRequest(modifiedEvent, null, servletContext, mapper);
 		assertNotNull(request);
 	}
+
+	@MethodSource("v2Data")
+	@ParameterizedTest
+	public void validateHttpApiContextAttribute(String jsonEvent) {
+		ServerlessServletContext servletContext = new ServerlessServletContext();
+		HttpServletRequest request = AwsSpringHttpProcessingUtils.generateHttpServletRequest(jsonEvent, null, servletContext, mapper);
+		assertNotNull(request.getAttribute(RequestReader.HTTP_API_CONTEXT_PROPERTY));
+	}
+
+	@MethodSource("v2Data")
+	@ParameterizedTest
+	public void validateHttpApiStageVarsAttribute(String jsonEvent) {
+		ServerlessServletContext servletContext = new ServerlessServletContext();
+		HttpServletRequest request = AwsSpringHttpProcessingUtils.generateHttpServletRequest(jsonEvent, null, servletContext, mapper);
+		assertNotNull(request.getAttribute(RequestReader.HTTP_API_STAGE_VARS_PROPERTY));
+	}
+
+	@MethodSource("v2Data")
+	@ParameterizedTest
+	public void validateHttpApiEventAttribute(String jsonEvent) {
+		ServerlessServletContext servletContext = new ServerlessServletContext();
+		HttpServletRequest request = AwsSpringHttpProcessingUtils.generateHttpServletRequest(jsonEvent, null, servletContext, mapper);
+		assertNotNull(request.getAttribute(RequestReader.HTTP_API_EVENT_PROPERTY));
+	}
 
     @EnableAutoConfiguration
     @Configuration

aws-serverless-java-container-springboot4/src/test/java/com/amazonaws/serverless/proxy/spring/AwsSpringHttpProcessingUtilsTests.java

@@ -224,6 +224,10 @@ public static Collection<String> v1Data() {
         return Arrays.asList(new String[]{API_GATEWAY_EVENT, ALB_EVENT});
     }
 
+    public static Collection<String> v2Data() {
+        return Arrays.asList(new String[]{API_GATEWAY_EVENT_V2});
+    }
+
     @MethodSource("data")
     @ParameterizedTest
 	public void validateHttpServletRequestGenerationWithInputStream(String jsonEvent) {
@@ -259,6 +263,21 @@ public void validateHttpServletRequestGenerationWithJson(String jsonEvent) {
 		// spot check some headers
 		assertRequest(request);
 	}
+
+    @MethodSource("data")
+    @ParameterizedTest
+    public void validateRequestResponse(String jsonEvent) throws Exception {
+    	try (ConfigurableApplicationContext context = SpringApplication.run(EmptyApplication.class);) {
+    		ServerlessMVC mvc = ServerlessMVC.INSTANCE((ServletWebServerApplicationContext) context);
+    		AwsProxyHttpServletResponseWriter responseWriter = new AwsProxyHttpServletResponseWriter();
+    		AwsProxyResponse awsResponse = AwsSpringHttpProcessingUtils.processRequest(
+					AwsSpringHttpProcessingUtils.generateHttpServletRequest(jsonEvent, null,
+							mvc.getServletContext(), mapper), mvc, responseWriter);
+    		assertEquals("hello", awsResponse.getBody());
+    		assertEquals(200, awsResponse.getStatusCode());
+    	}
+    	
+    }
 
 
 	@MethodSource("v1Data")
@@ -269,7 +288,7 @@ public void validateLambdaContextAttribute(String jsonEvent) {
 		assertNotNull(request.getAttribute(RequestReader.API_GATEWAY_EVENT_PROPERTY));
 	}
 
-	@MethodSource("v1Data")
+	@MethodSource("data")
 	@ParameterizedTest
 	public void validateSecurityContextAttribute(String jsonEvent) {
 		ServerlessServletContext servletContext = new ServerlessServletContext();
@@ -288,7 +307,7 @@ public void validateNullMultiValueHeaders(String jsonEvent) throws Exception {
 		assertNotNull(request);
 	}
 
-	@MethodSource("v1Data")
+	@MethodSource("data")
 	@ParameterizedTest
 	public void validateBase64EncodedBody(String jsonEvent) throws Exception {
 		String base64Body = java.util.Base64.getEncoder().encodeToString("test body".getBytes(StandardCharsets.UTF_8));
@@ -301,6 +320,30 @@ public void validateBase64EncodedBody(String jsonEvent) throws Exception {
 		assertNotNull(request);
 	}
 
+	@MethodSource("v2Data")
+	@ParameterizedTest
+	public void validateHttpApiContextAttribute(String jsonEvent) {
+		ServerlessServletContext servletContext = new ServerlessServletContext();
+		HttpServletRequest request = AwsSpringHttpProcessingUtils.generateHttpServletRequest(jsonEvent, null, servletContext, mapper);
+		assertNotNull(request.getAttribute(RequestReader.HTTP_API_CONTEXT_PROPERTY));
+	}
+
+	@MethodSource("v2Data")
+	@ParameterizedTest
+	public void validateHttpApiStageVarsAttribute(String jsonEvent) {
+		ServerlessServletContext servletContext = new ServerlessServletContext();
+		HttpServletRequest request = AwsSpringHttpProcessingUtils.generateHttpServletRequest(jsonEvent, null, servletContext, mapper);
+		assertNotNull(request.getAttribute(RequestReader.HTTP_API_STAGE_VARS_PROPERTY));
+	}
+
+	@MethodSource("v2Data")
+	@ParameterizedTest
+	public void validateHttpApiEventAttribute(String jsonEvent) {
+		ServerlessServletContext servletContext = new ServerlessServletContext();
+		HttpServletRequest request = AwsSpringHttpProcessingUtils.generateHttpServletRequest(jsonEvent, null, servletContext, mapper);
+		assertNotNull(request.getAttribute(RequestReader.HTTP_API_EVENT_PROPERTY));
+	}
+
     @EnableAutoConfiguration
     @Configuration
     @EnableWebSecurity