Migrate to APIGatewayV2HTTPEvent in struts and spark

Author: mbfreder

aws-serverless-java-container-spark/src/main/java/com/amazonaws/serverless/proxy/spark/SparkLambdaContainerHandler.java

@@ -119,17 +119,17 @@ public static SparkLambdaContainerHandler<AwsProxyRequest, AwsProxyResponse> get
     }
 
     /**
-     * Returns a new instance of an SparkLambdaContainerHandler initialized to work with <code>HttpApiV2ProxyRequest</code>
+     * Returns a new instance of an SparkLambdaContainerHandler initialized to work with <code>APIGatewayV2HTTPEvent</code>
      * and <code>AwsProxyResponse</code> objects.
      *
      * @return a new instance of <code>SparkLambdaContainerHandler</code>
      *
      * @throws ContainerInitializationException Throws this exception if we fail to initialize the Spark container.
      * This could be caused by the introspection used to insert the library as the default embedded container
      */
-    public static SparkLambdaContainerHandler<HttpApiV2ProxyRequest, AwsProxyResponse> getHttpApiV2ProxyHandler()
+    public static SparkLambdaContainerHandler<APIGatewayV2HTTPEvent, AwsProxyResponse> getHttpApiV2ProxyHandler()
             throws ContainerInitializationException {
-        SparkLambdaContainerHandler<HttpApiV2ProxyRequest, AwsProxyResponse> newHandler = new SparkLambdaContainerHandler<>(HttpApiV2ProxyRequest.class,
+        SparkLambdaContainerHandler<APIGatewayV2HTTPEvent, AwsProxyResponse> newHandler = new SparkLambdaContainerHandler<>(APIGatewayV2HTTPEvent.class,
                 AwsProxyResponse.class,
                 new AwsHttpApiV2HttpServletRequestReader(),
                 new AwsProxyHttpServletResponseWriter(true),

aws-serverless-java-container-spark/src/test/java/com/amazonaws/serverless/proxy/spark/HelloWorldSparkStreamTest.java

@@ -8,7 +8,6 @@
 import com.amazonaws.serverless.proxy.model.AwsProxyRequest;
 import com.amazonaws.serverless.proxy.model.AwsProxyResponse;
 
-import com.amazonaws.serverless.proxy.model.HttpApiV2ProxyRequest;
 import com.amazonaws.services.lambda.runtime.Context;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -39,7 +38,7 @@ public class HelloWorldSparkStreamTest {
     private static final String COOKIE_PATH = "/";
 
     private static SparkLambdaContainerHandler<AwsProxyRequest, AwsProxyResponse> handler;
-    private static SparkLambdaContainerHandler<HttpApiV2ProxyRequest, AwsProxyResponse> httpApiHandler;
+    private static SparkLambdaContainerHandler<APIGatewayV2HTTPEvent, AwsProxyResponse> httpApiHandler;
 
     private String type;
 

aws-serverless-java-container-struts/src/main/java/com/amazonaws/serverless/proxy/struts/StrutsLambdaContainerHandler.java

@@ -71,9 +71,9 @@ public static StrutsLambdaContainerHandler<AwsProxyRequest, AwsProxyResponse> ge
                 new AwsProxyExceptionHandler());
     }
 
-    public static StrutsLambdaContainerHandler<HttpApiV2ProxyRequest, AwsProxyResponse> getHttpApiV2ProxyHandler() {
+    public static StrutsLambdaContainerHandler<APIGatewayV2HTTPEvent, AwsProxyResponse> getHttpApiV2ProxyHandler() {
         return new StrutsLambdaContainerHandler(
-                HttpApiV2ProxyRequest.class,
+                APIGatewayV2HTTPEvent.class,
                 AwsProxyResponse.class,
                 new AwsHttpApiV2HttpServletRequestReader(),
                 new AwsProxyHttpServletResponseWriter(true),

aws-serverless-java-container-struts/src/test/java/com/amazonaws/serverless/proxy/struts/StrutsAwsProxyTest.java

@@ -62,7 +62,7 @@ public class StrutsAwsProxyTest extends StrutsRestTestCase<EchoAction> {
     private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
     private final StrutsLambdaContainerHandler<AwsProxyRequest, AwsProxyResponse> handler = StrutsLambdaContainerHandler
             .getAwsProxyHandler();
-    private final StrutsLambdaContainerHandler<HttpApiV2ProxyRequest, AwsProxyResponse> httpApiHandler = StrutsLambdaContainerHandler
+    private final StrutsLambdaContainerHandler<APIGatewayV2HTTPEvent, AwsProxyResponse> httpApiHandler = StrutsLambdaContainerHandler
             .getHttpApiV2ProxyHandler();
     private final Context lambdaContext = new MockLambdaContext();
     private String type;