fix samples

aws · Jun 11, 2023 · 8430ff4 · 8430ff4
1 parent 1f36923
commit 8430ff4
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 11 deletions.
diff --git a/.../com/amazonaws/serverless/proxy/internal/servlet/AwsHttpApiV2ProxyHttpServletRequest.java b/.../com/amazonaws/serverless/proxy/internal/servlet/AwsHttpApiV2ProxyHttpServletRequest.java
@@ -536,4 +536,5 @@ private Headers headersMapToMultiValue(Map<String, String> headers) {
         }
         return h;
     }
+
 }
diff --git a/...y/pet-store/src/main/java/com/amazonaws/serverless/sample/jersey/StreamLambdaHandler.java b/...y/pet-store/src/main/java/com/amazonaws/serverless/sample/jersey/StreamLambdaHandler.java
@@ -4,10 +4,10 @@
 import com.amazonaws.serverless.proxy.internal.LambdaContainerHandler;
 import com.amazonaws.serverless.proxy.internal.testutils.Timer;
 import com.amazonaws.serverless.proxy.jersey.JerseyLambdaContainerHandler;
-import com.amazonaws.serverless.proxy.model.AwsProxyResponse;
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
+import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
 
 import org.glassfish.jersey.jackson.JacksonFeature;
 import org.glassfish.jersey.server.ResourceConfig;
@@ -29,7 +29,7 @@ public class StreamLambdaHandler implements RequestStreamHandler {
             .property(ServerProperties.MOXY_JSON_FEATURE_DISABLE,true)
                                                              .packages("com.amazonaws.serverless.sample.jersey")
                                                              .register(JacksonFeature.class);
-    private static final JerseyLambdaContainerHandler<APIGatewayProxyRequestEvent, AwsProxyResponse> handler
+    private static final JerseyLambdaContainerHandler<APIGatewayProxyRequestEvent, APIGatewayProxyResponseEvent> handler
             = JerseyLambdaContainerHandler.getAwsProxyHandler(jerseyApplication);
 
     public StreamLambdaHandler() {

diff --git a/...g/pet-store/src/main/java/com/amazonaws/serverless/sample/spring/StreamLambdaHandler.java b/...g/pet-store/src/main/java/com/amazonaws/serverless/sample/spring/StreamLambdaHandler.java
@@ -9,6 +9,7 @@
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
+import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
 
 import jakarta.servlet.DispatcherType;
 import jakarta.servlet.FilterRegistration;
@@ -20,7 +21,7 @@
 
 
 public class StreamLambdaHandler implements RequestStreamHandler {
-    private static SpringLambdaContainerHandler<APIGatewayProxyRequestEvent, AwsProxyResponse> handler;
+    private static SpringLambdaContainerHandler<APIGatewayProxyRequestEvent, APIGatewayProxyResponseEvent> handler;
     static {
         try {
             handler = SpringLambdaContainerHandler.getAwsProxyHandler(PetStoreSpringAppConfig.class);

diff --git a/...re/src/main/java/com/amazonaws/serverless/sample/spring/filter/CognitoIdentityFilter.java b/...re/src/main/java/com/amazonaws/serverless/sample/spring/filter/CognitoIdentityFilter.java
@@ -2,7 +2,8 @@
 
 
 import com.amazonaws.serverless.proxy.RequestReader;
-import com.amazonaws.serverless.proxy.model.AwsProxyRequestContext;
+import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPEvent;
+import com.amazonaws.serverless.proxy.internal.servlet.AwsHttpServletRequest;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -41,26 +42,31 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
         if (apiGwContext == null) {
             log.warn("API Gateway context is null");
             filterChain.doFilter(servletRequest, servletResponse);
+            return;
         }
-        if (!AwsProxyRequestContext.class.isAssignableFrom(apiGwContext.getClass())) {
+        if (!APIGatewayV2HTTPEvent.RequestContext.class.isAssignableFrom(apiGwContext.getClass())) {
             log.warn("API Gateway context object is not of valid type");
             filterChain.doFilter(servletRequest, servletResponse);
         }
 
-        AwsProxyRequestContext ctx = (AwsProxyRequestContext)apiGwContext;
-        if (ctx.getIdentity() == null) {
+        APIGatewayV2HTTPEvent.RequestContext.CognitoIdentity cognito = (APIGatewayV2HTTPEvent.RequestContext.CognitoIdentity)
+                ((AwsHttpServletRequest)servletRequest).getRequest()
+                        .getRequestContext()
+                        .getAuthorizer()
+                        .getIam()
+                        .getCognitoIdentity();
+        if (cognito == null) {
             log.warn("Identity context is null");
             filterChain.doFilter(servletRequest, servletResponse);
         }
-        String cognitoIdentityId = ctx.getIdentity().getCognitoIdentityId();
+        String cognitoIdentityId = cognito.getIdentityId();
         if (cognitoIdentityId == null || "".equals(cognitoIdentityId.trim())) {
             log.warn("Cognito identity id in request is null");
         }
         servletRequest.setAttribute(COGNITO_IDENTITY_ATTRIBUTE, cognitoIdentityId);
         filterChain.doFilter(servletRequest, servletResponse);
     }
 
-
     @Override
     public void destroy() {
         // nothing to do in destroy

diff --git a/...c/main/java/com/amazonaws/serverless/sample/springboot3/filter/CognitoIdentityFilter.java b/...c/main/java/com/amazonaws/serverless/sample/springboot3/filter/CognitoIdentityFilter.java
@@ -2,7 +2,8 @@
 
 
 import com.amazonaws.serverless.proxy.RequestReader;
-import com.amazonaws.serverless.proxy.model.AwsProxyRequestContext;
+import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPEvent;
+import com.amazonaws.serverless.proxy.internal.servlet.AwsHttpServletRequest;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -49,7 +50,7 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
         }
 
         APIGatewayV2HTTPEvent.RequestContext.CognitoIdentity cognito = (APIGatewayV2HTTPEvent.RequestContext.CognitoIdentity)
-                servletRequest.getRequest()
+                ((AwsHttpServletRequest)servletRequest).getRequest()
                         .getRequestContext()
                         .getAuthorizer()
                         .getIam()