Addressing issue reported in #117 and added a unit test for it.

Author: sapessi

aws-serverless-java-container-spring/src/main/java/com/amazonaws/serverless/proxy/spring/LambdaSpringApplicationInitializer.java

@@ -115,7 +115,7 @@ public void dispatch(HttpServletRequest request, HttpServletResponse response)
      * Gets the initialized Spring dispatcher servlet instance.
      * @return The Spring dispatcher servlet
      */
-    public Servlet getDispatcherServlet() {
+    public DispatcherServlet getDispatcherServlet() {
         return dispatcherServlet;
     }
 

aws-serverless-java-container-spring/src/main/java/com/amazonaws/serverless/proxy/spring/SpringLambdaContainerHandler.java

@@ -108,15 +108,36 @@ public SpringLambdaContainerHandler(Class<RequestType> requestTypeClass,
         Timer.stop("SPRING_CONTAINER_HANDLER_CONSTRUCTOR");
     }
 
+
+    /**
+     * Asks the custom web application initializer to refresh the Spring context.
+     * @param refreshContext true if the context should be refreshed
+     */
     public void setRefreshContext(boolean refreshContext) {
         this.initializer.setRefreshContext(refreshContext);
     }
 
+
+    /**
+     * Returns the custom web application initializer used by the object. The custom application initializer gives you access
+     * to the dispatcher servlet.
+     * @return The instance of the custom {@link org.springframework.web.WebApplicationInitializer}
+     */
+    public LambdaSpringApplicationInitializer getApplicationInitializer() {
+        return initializer;
+    }
+
     @Override
     protected AwsHttpServletResponse getContainerResponse(AwsProxyHttpServletRequest request, CountDownLatch latch) {
         return new AwsHttpServletResponse(request, latch);
     }
 
+
+    /**
+     * Activates the given Spring profiles in the application.
+     * @param profiles A number of spring profiles
+     * @throws ContainerInitializationException if the initializer is not set yet.
+     */
     public void activateSpringProfiles(String... profiles) throws ContainerInitializationException {
         if (initializer == null) {
             throw new ContainerInitializationException(LambdaSpringApplicationInitializer.ERROR_NO_CONTEXT, null);

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

@@ -7,6 +7,7 @@
 import com.amazonaws.serverless.proxy.internal.testutils.MockLambdaContext;
 import com.amazonaws.serverless.proxy.spring.echoapp.EchoResource;
 import com.amazonaws.serverless.proxy.spring.echoapp.EchoSpringAppConfig;
+import com.amazonaws.serverless.proxy.spring.echoapp.RestControllerAdvice;
 import com.amazonaws.serverless.proxy.spring.echoapp.UnauthenticatedFilter;
 import com.amazonaws.serverless.proxy.spring.echoapp.model.MapResponseModel;
 import com.amazonaws.serverless.proxy.spring.echoapp.model.SingleValueModel;
@@ -55,6 +56,20 @@ public void clearServletContextCache() {
         AwsServletContext.clearServletContextCache();
     }
 
+    @Test
+    public void controllerAdvice_invalidPath_returnAdvice() {
+        AwsProxyRequest request = new AwsProxyRequestBuilder("/echo2", "GET")
+                                          .json()
+                                          .header(CUSTOM_HEADER_KEY, CUSTOM_HEADER_VALUE)
+                                          .build();
+
+        AwsProxyResponse output = handler.proxy(request, lambdaContext);
+        assertNotNull(output);
+        assertEquals(404, output.getStatusCode());
+        validateSingleValueModel(output, RestControllerAdvice.ERROR_MESSAGE);
+
+    }
+
     @Test
     public void headers_getHeaders_echo() {
         AwsProxyRequest request = new AwsProxyRequestBuilder("/echo/headers", "GET")

aws-serverless-java-container-spring/src/test/java/com/amazonaws/serverless/proxy/spring/echoapp/EchoSpringAppConfig.java

@@ -36,6 +36,8 @@ public SpringLambdaContainerHandler springLambdaContainerHandler() throws Contai
             // update the registration to map to a path
             registration.addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST), true, "/echo/*");
             // servlet name mappings are disabled and will throw an exception
+
+            handler.getApplicationInitializer().getDispatcherServlet().setThrowExceptionIfNoHandlerFound(true);
         });
 
         return handler;

aws-serverless-java-container-spring/src/test/java/com/amazonaws/serverless/proxy/spring/echoapp/RestControllerAdvice.java

@@ -0,0 +1,27 @@
+package com.amazonaws.serverless.proxy.spring.echoapp;
+
+
+import com.amazonaws.serverless.proxy.spring.echoapp.model.SingleValueModel;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.NoHandlerFoundException;
+
+
+@ControllerAdvice
+@RequestMapping(produces = "application/json")
+@ResponseBody
+public class RestControllerAdvice {
+    public static final String ERROR_MESSAGE = "UnhadledPath";
+
+    @ExceptionHandler(NoHandlerFoundException.class)
+    public ResponseEntity<SingleValueModel> unhandledPath(final NoHandlerFoundException e) {
+        SingleValueModel model = new SingleValueModel();
+        model.setValue(ERROR_MESSAGE);
+        return new ResponseEntity<SingleValueModel>(model, HttpStatus.NOT_FOUND);
+    }
+}