More tests and bug fixes

sapessi · sapessi · commit a318a113d3cb · 2017-03-28T11:31:14.000-07:00
More unit tests for #15 and added a unit test to verify #16. Updated readme to include servlet filter section
diff --git a/README.md b/README.md
@@ -138,3 +138,15 @@ public String echoServletHeaders(@Context HttpServletRequest context) {
     return "servlet";
 }
 ```
+
+## Servlet Filters
+You can register [`Filter`](https://docs.oracle.com/javaee/7/api/javax/servlet/Filter.html) implementations by implementing a `StartupsHandler` as defined in the `AwsLambdaServletContainerHandler` class. The `onStartup` methods receives a reference to the current `ServletContext`.
+
+```java
+handler.setStartupHandler(c -> {
+    FilterRegistration.Dynamic registration = c.addFilter("CustomHeaderFilter", CustomHeaderFilter.class);
+    // update the registration to map to a path
+    registration.addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST), true, "/*");
+    // servlet name mappings are disabled and will throw an exception
+});
+```
diff --git a/aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsLambdaServletContainerHandler.java b/aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsLambdaServletContainerHandler.java
@@ -67,7 +67,7 @@ protected AwsLambdaServletContainerHandler(RequestReader<RequestType, ContainerR
      * Sets the ServletContext in the handler and initialized a new <code>FilterChainManager</code>
      * @param context An initialized ServletContext
      */
-    protected void setServletContext(ServletContext context) {
+    protected void setServletContext(final ServletContext context) {
         servletContext = context;
         // We assume custom implementations of the RequestWriter for HttpServletRequest will reuse
         // the existing AwsServletContext object since it has no dependencies other than the Lambda context
@@ -114,7 +114,7 @@ public ServletContext getServletContext() {
      * </pre>
      * @param h A lambda expression that implements the <code>StartupHandler</code> functional interface
      */
-    public void setStartupHandler(StartupHandler h) {
+    public void setStartupHandler(final StartupHandler h) {
         startupHandler = h;
     }
 
diff --git a/aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/FilterChainHolder.java b/aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/FilterChainHolder.java
@@ -97,7 +97,8 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
         if (filters == null || filters.size() == 0 || currentFilter > filters.size() - 1) {
             return;
         }
-        // TODO: We do check for async filters here
+        // TODO: We do not check for async filters here
+
         FilterHolder holder = filters.get(currentFilter);
 
         if (!holder.isFilterInitialized()) {
diff --git a/aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/FilterChainManager.java b/aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/FilterChainManager.java
@@ -76,7 +76,7 @@ protected FilterChainManager(ServletContextType context) {
      * @param request The incoming servlet request
      * @return A <code>FilterChainHolder</code> object that can be used to apply the filters to the request
      */
-    public FilterChainHolder getFilterChain(HttpServletRequest request) {
+    public FilterChainHolder getFilterChain(final HttpServletRequest request) {
         String targetPath = request.getServletPath();
         DispatcherType type = request.getDispatcherType();
 
@@ -130,7 +130,7 @@ public FilterChainHolder getFilterChain(HttpServletRequest request) {
      * @param targetPath The request path - this is extracted with the <code>getPath</code> method of the request object
      * @return A populated FilterChainHolder
      */
-    protected FilterChainHolder getFilterChainCache(DispatcherType type, String targetPath) {
+    protected FilterChainHolder getFilterChainCache(final DispatcherType type, final String targetPath) {
         TargetCacheKey key = new TargetCacheKey();
         key.setDispatcherType(type);
         key.setTargetPath(targetPath);
@@ -147,7 +147,7 @@ protected FilterChainHolder getFilterChainCache(DispatcherType type, String targ
      * @param targetPath The target path in the API
      * @param holder The FilterChainHolder object to save in the cache
      */
-    protected void putFilterChainCache(DispatcherType type, String targetPath, FilterChainHolder holder) {
+    protected void putFilterChainCache(final DispatcherType type, final String targetPath, final FilterChainHolder holder) {
         TargetCacheKey key = new TargetCacheKey();
         key.setDispatcherType(type);
         key.setTargetPath(targetPath);
@@ -167,7 +167,7 @@ protected void putFilterChainCache(DispatcherType type, String targetPath, Filte
      * @param mapping The mapping path stored in the filter registration
      * @return true if the given mapping path can apply to the target, false otherwise.
      */
-    protected boolean pathMatches(String target, String mapping) {
+    protected boolean pathMatches(final String target, final String mapping) {
         // easiest case, they are exactly the same
         if (target.toLowerCase().equals(mapping.toLowerCase())) {
             return true;
diff --git a/aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/FilterHolder.java b/aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/FilterHolder.java
@@ -28,9 +28,9 @@ public class FilterHolder {
     // Variables - Private
     //-------------------------------------------------------------
 
-    private  Filter filter;
-    private  FilterConfig filterConfig;
-    private  Registration registration;
+    private Filter filter;
+    private FilterConfig filterConfig;
+    private Registration registration;
     private String filterName;
     private Map<String, String> initParameters;
 
diff --git a/aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/testutils/AwsProxyRequestBuilder.java b/aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/testutils/AwsProxyRequestBuilder.java
@@ -16,6 +16,8 @@
 import com.amazonaws.serverless.proxy.internal.model.ApiGatewayRequestContext;
 import com.amazonaws.serverless.proxy.internal.model.ApiGatewayRequestIdentity;
 import com.amazonaws.serverless.proxy.internal.model.AwsProxyRequest;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
@@ -31,6 +33,7 @@ public class AwsProxyRequestBuilder {
     //-------------------------------------------------------------
 
     private AwsProxyRequest request;
+    private ObjectMapper mapper;
 
 
     //-------------------------------------------------------------
@@ -48,6 +51,8 @@ public AwsProxyRequestBuilder(String path) {
 
 
     public AwsProxyRequestBuilder(String path, String httpMethod) {
+        this.mapper = new ObjectMapper();
+
         this.request = new AwsProxyRequest();
         this.request.setHttpMethod(httpMethod);
         this.request.setPath(path);
@@ -125,6 +130,18 @@ public AwsProxyRequestBuilder body(String body) {
         return this;
     }
 
+    public AwsProxyRequestBuilder body(Object body) {
+        if (request.getHeaders() != null && request.getHeaders().get(HttpHeaders.CONTENT_TYPE).equals(MediaType.APPLICATION_JSON)) {
+            try {
+                return body(mapper.writeValueAsString(body));
+            } catch (JsonProcessingException e) {
+                throw new UnsupportedOperationException("Could not serialize object: " + e.getMessage());
+            }
+        } else {
+            throw new UnsupportedOperationException("Unsupported content type in request");
+        }
+    }
+
 
     public AwsProxyRequestBuilder authorizerPrincipal(String principal) {
         if (this.request.getRequestContext().getAuthorizer() == null) {
diff --git a/aws-serverless-java-container-spring/pom.xml b/aws-serverless-java-container-spring/pom.xml
@@ -78,6 +78,27 @@
             <version>${jackson.version}</version>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>5.4.1.Final</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.el</groupId>
+            <artifactId>javax.el-api</artifactId>
+            <version>2.2.4</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.glassfish.web</groupId>
+            <artifactId>javax.el</artifactId>
+            <version>2.2.4</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/aws-serverless-java-container-spring/src/test/java/com/amazonaws/serverless/proxy/spring/SpringServletContextTest.java b/aws-serverless-java-container-spring/src/test/java/com/amazonaws/serverless/proxy/spring/SpringServletContextTest.java
@@ -9,29 +9,14 @@
 import com.amazonaws.serverless.proxy.internal.testutils.MockLambdaContext;
 import com.amazonaws.serverless.proxy.spring.echoapp.CustomHeaderFilter;
 import com.amazonaws.serverless.proxy.spring.echoapp.EchoSpringAppConfig;
-import com.amazonaws.serverless.proxy.spring.echoapp.model.MapResponseModel;
-import com.amazonaws.serverless.proxy.spring.echoapp.model.SingleValueModel;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.commons.codec.binary.Base64;
+import com.amazonaws.serverless.proxy.spring.echoapp.model.ValidatedUserModel;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestExecutionListeners;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;
-import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.http.HttpStatus;
 
 import javax.servlet.DispatcherType;
 import javax.servlet.FilterRegistration;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import java.io.IOException;
 import java.util.EnumSet;
-import java.util.UUID;
 
 import static org.junit.Assert.*;
 
@@ -98,5 +83,18 @@ public void filter_customHeaderFilter_echoHeaders() {
         assertNotNull(output.getHeaders().get(CustomHeaderFilter.HEADER_NAME));
         assertEquals(CustomHeaderFilter.HEADER_VALUE, output.getHeaders().get(CustomHeaderFilter.HEADER_NAME));
     }
+
+    @Test
+    public void filter_validationFilter_emptyName() {
+        ValidatedUserModel userModel = new ValidatedUserModel();
+        userModel.setFirstName("Test");
+        AwsProxyRequest request = new AwsProxyRequestBuilder("/context/user", "POST")
+                .json()
+                .body(userModel)
+                .build();
+
+        AwsProxyResponse output = handler.proxy(request, lambdaContext);
+        assertEquals(HttpStatus.BAD_REQUEST.value(), output.getStatusCode());
+    }
 }
 
diff --git a/aws-serverless-java-container-spring/src/test/java/com/amazonaws/serverless/proxy/spring/echoapp/ContextResource.java b/aws-serverless-java-container-spring/src/test/java/com/amazonaws/serverless/proxy/spring/echoapp/ContextResource.java
@@ -1,14 +1,19 @@
 package com.amazonaws.serverless.proxy.spring.echoapp;
 
+import com.amazonaws.serverless.proxy.spring.echoapp.model.ValidatedUserModel;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.context.ServletContextAware;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 
 import javax.servlet.ServletContext;
+import javax.validation.Valid;
+import javax.ws.rs.core.MediaType;
 
 @RestController
 @EnableWebMvc
@@ -21,6 +26,16 @@ public ResponseEntity<String> getContext() {
         return new ResponseEntity<String>(this.context.getServerInfo(), HttpStatus.OK);
     }
 
+    @RequestMapping(path = "/user", method=RequestMethod.POST, consumes = MediaType.APPLICATION_JSON)
+    public ResponseEntity<ValidatedUserModel> createUser(@Valid @RequestBody ValidatedUserModel newUser, BindingResult results) {
+
+        if (results.hasErrors()) {
+            System.out.println("Has errors");
+            return new ResponseEntity<ValidatedUserModel>(newUser, HttpStatus.BAD_REQUEST);
+        }
+        return new ResponseEntity<ValidatedUserModel>(newUser, HttpStatus.OK);
+    }
+
     @Override
     public void setServletContext(ServletContext servletContext) {
         context = servletContext;
diff --git a/aws-serverless-java-container-spring/src/test/java/com/amazonaws/serverless/proxy/spring/echoapp/EchoSpringAppConfig.java b/aws-serverless-java-container-spring/src/test/java/com/amazonaws/serverless/proxy/spring/echoapp/EchoSpringAppConfig.java
@@ -2,14 +2,13 @@
 
 import com.amazonaws.serverless.exceptions.ContainerInitializationException;
 import com.amazonaws.serverless.proxy.internal.testutils.MockLambdaContext;
-import com.amazonaws.serverless.proxy.spring.LambdaSpringApplicationInitializer;
 import com.amazonaws.serverless.proxy.spring.SpringLambdaContainerHandler;
-import com.amazonaws.services.lambda.runtime.Context;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
 import org.springframework.web.context.ConfigurableWebApplicationContext;
 
 @Configuration
@@ -35,4 +34,9 @@ public ObjectMapper objectMapper() {
     public MockLambdaContext lambdaContext() {
         return new MockLambdaContext();
     }
+
+    @Bean
+    public javax.validation.Validator localValidatorFactoryBean() {
+        return new LocalValidatorFactoryBean();
+    }
 }
diff --git a/aws-serverless-java-container-spring/src/test/java/com/amazonaws/serverless/proxy/spring/echoapp/model/ValidatedUserModel.java b/aws-serverless-java-container-spring/src/test/java/com/amazonaws/serverless/proxy/spring/echoapp/model/ValidatedUserModel.java
@@ -0,0 +1,44 @@
+package com.amazonaws.serverless.proxy.spring.echoapp.model;
+
+import org.hibernate.validator.constraints.Email;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import javax.validation.constraints.Size;
+
+public class ValidatedUserModel {
+    @NotEmpty
+    @Size(min=2, max=30)
+    private String firstName;
+
+    @NotEmpty
+    @Size(min=2, max=30)
+    private String lastName;
+
+    @NotEmpty
+    @Email
+    private String email;
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+}
diff --git a/samples/jersey/pet-store/src/main/java/com/amazonaws/serverless/sample/jersey/LambdaHandler.java b/samples/jersey/pet-store/src/main/java/com/amazonaws/serverless/sample/jersey/LambdaHandler.java
@@ -21,10 +21,10 @@
 import org.glassfish.jersey.server.ResourceConfig;
 
 public class LambdaHandler implements RequestHandler<AwsProxyRequest, AwsProxyResponse> {
-    private ResourceConfig jerseyApplication = new ResourceConfig()
+    private final ResourceConfig jerseyApplication = new ResourceConfig()
             .packages("com.amazonaws.serverless.sample.jersey")
             .register(JacksonFeature.class);
-    private JerseyLambdaContainerHandler<AwsProxyRequest, AwsProxyResponse> handler
+    private final JerseyLambdaContainerHandler<AwsProxyRequest, AwsProxyResponse> handler
             = JerseyLambdaContainerHandler.getAwsProxyHandler(jerseyApplication);
 
     @Override
diff --git a/samples/spring/pet-store/src/main/java/com/amazonaws/serverless/sample/spring/LambdaHandler.java b/samples/spring/pet-store/src/main/java/com/amazonaws/serverless/sample/spring/LambdaHandler.java
@@ -23,12 +23,10 @@
  * Created by bulianis on 12/13/16.
  */
 public class LambdaHandler implements RequestHandler<AwsProxyRequest, AwsProxyResponse> {
-    SpringLambdaContainerHandler<AwsProxyRequest, AwsProxyResponse> handler;
-    boolean isinitialized = false;
+    private SpringLambdaContainerHandler<AwsProxyRequest, AwsProxyResponse> handler;
 
     public AwsProxyResponse handleRequest(AwsProxyRequest awsProxyRequest, Context context) {
-        if (!isinitialized) {
-            isinitialized = true;
+        if (handler == null) {
             try {
                 handler = SpringLambdaContainerHandler.getAwsProxyHandler(PetStoreSpringAppConfig.class);
             } catch (ContainerInitializationException e) {

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,8 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo`
`97`	`97`	`if (filters == null \|\| filters.size() == 0 \|\| currentFilter > filters.size() - 1) {`
`98`	`98`	`return;`
`99`	`99`	`}`
`100`		`- // TODO: We do check for async filters here`
	`100`	`+ // TODO: We do not check for async filters here`
	`101`	`+`
`101`	`102`	`FilterHolder holder = filters.get(currentFilter);`
`102`	`103`
`103`	`104`	`if (!holder.isFilterInitialized()) {`