combine v2 request tests into one test

Author: tobixlea

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

@@ -324,22 +324,8 @@ 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));
+        assertNotNull(request.getAttribute(RequestReader.HTTP_API_STAGE_VARS_PROPERTY));
+        assertNotNull(request.getAttribute(RequestReader.HTTP_API_EVENT_PROPERTY));
 	}
 
     @EnableAutoConfiguration

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

@@ -326,22 +326,8 @@ 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));
+        assertNotNull(request.getAttribute(RequestReader.HTTP_API_STAGE_VARS_PROPERTY));
+        assertNotNull(request.getAttribute(RequestReader.HTTP_API_EVENT_PROPERTY));
 	}
 
     @EnableAutoConfiguration