More unit tests and final fixes

Changed the ContainerConfig property to be static

Author: sapessi

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/LambdaContainerHandler.java

@@ -37,6 +37,7 @@ public abstract class LambdaContainerHandler<RequestType, ResponseType, Containe
 
     public static final String SERVER_INFO = "aws-serverless-java-container";
 
+
     //-------------------------------------------------------------
     // Variables - Private
     //-------------------------------------------------------------
@@ -48,7 +49,12 @@ public abstract class LambdaContainerHandler<RequestType, ResponseType, Containe
 
     protected Context lambdaContext;
 
-    private ContainerConfig config = ContainerConfig.defaultConfig();
+
+    //-------------------------------------------------------------
+    // Variables - Private - Static
+    //-------------------------------------------------------------
+
+    private static ContainerConfig config = ContainerConfig.defaultConfig();
 
 
     //-------------------------------------------------------------
@@ -81,11 +87,19 @@ protected abstract void handleRequest(ContainerRequestType containerRequest, Con
     // Methods - Public
     //-------------------------------------------------------------
 
+    /**
+     * Configures the library to strip a base path from incoming requests before passing them on to the wrapped
+     * framework. This was added in response to issue #34 (https://github.com/awslabs/aws-serverless-java-container/issues/34).
+     * When creating a base path mapping for custom domain names in API Gateway we want to be able to strip the base path
+     * from the request - the underlying service may not recognize this path.
+     * @param basePath The base path to be stripped from the request
+     */
     public void stripBasePath(String basePath) {
         config.setStripBasePath(true);
         config.setServiceBasePath(basePath);
     }
 
+
     /**
      * Proxies requests to the underlying container given the incoming Lambda request. This method returns a populated
      * return object for the Lambda function.
@@ -114,4 +128,17 @@ public ResponseType proxy(RequestType request, Context context) {
             return exceptionHandler.handle(e);
         }
     }
+
+
+    //-------------------------------------------------------------
+    // Methods - Getter/Setter
+    //-------------------------------------------------------------
+
+    /**
+     * Returns the current container configuration object.
+     * @return
+     */
+    public static ContainerConfig getContainerConfig() {
+        return config;
+    }
 }

aws-serverless-java-container-core/src/test/java/com/amazonaws/serverless/proxy/internal/RequestReaderTest.java

@@ -53,4 +53,25 @@ public void requestReader_stripBasePath() {
         assertNotNull(finalPath);
         assertEquals(ORDERS_URL, finalPath);
     }
+
+    @Test
+    public void requestReader_doubleBasePath() {
+        ContainerConfig config = ContainerConfig.defaultConfig();
+        config.setStripBasePath(true);
+        config.setServiceBasePath(BASE_PATH_MAPPING);
+
+        String finalPath = requestReader.stripBasePath("/" + BASE_PATH_MAPPING + "/" + BASE_PATH_MAPPING, config);
+        assertNotNull(finalPath);
+        assertEquals("/" + BASE_PATH_MAPPING, finalPath);
+
+        finalPath = requestReader.stripBasePath("/custom/" + BASE_PATH_MAPPING, config);
+        assertNotNull(finalPath);
+        assertEquals("/custom/" + BASE_PATH_MAPPING, finalPath);
+
+        finalPath = requestReader.stripBasePath(BASE_PATH_MAPPING, config);
+        assertNotNull(finalPath);
+        // the request path does not start with a "/", the comparison in the method should fail
+        // and nothing should get replaced
+        assertEquals(BASE_PATH_MAPPING, finalPath);
+    }
 }

aws-serverless-java-container-core/src/test/java/com/amazonaws/serverless/proxy/internal/servlet/AwsProxyHttpServletRequestReaderTest.java

@@ -23,7 +23,7 @@ public class AwsProxyHttpServletRequestReaderTest {
 
     @Test
     public void readRequest_reflection_returnType() throws NoSuchMethodException {
-        Method readRequestMethod = AwsProxyHttpServletRequestReader.class.getMethod("readRequest", AwsProxyRequest.class, SecurityContext.class, Context.class);
+        Method readRequestMethod = AwsProxyHttpServletRequestReader.class.getMethod("readRequest", AwsProxyRequest.class, SecurityContext.class, Context.class, ContainerConfig.class);
 
         assertTrue(readRequestMethod.getReturnType() == AwsProxyHttpServletRequest.class);
     }

aws-serverless-java-container-jersey/src/main/java/com/amazonaws/serverless/proxy/jersey/factory/AwsProxyServletRequestFactory.java

@@ -15,10 +15,12 @@
 
 import com.amazonaws.serverless.exceptions.InvalidRequestEventException;
 import com.amazonaws.serverless.proxy.internal.AwsProxySecurityContextWriter;
+import com.amazonaws.serverless.proxy.internal.model.ContainerConfig;
 import com.amazonaws.serverless.proxy.internal.servlet.AwsProxyHttpServletRequest;
 import com.amazonaws.serverless.proxy.internal.servlet.AwsProxyHttpServletRequestReader;
 import com.amazonaws.serverless.proxy.internal.servlet.AwsServletContext;
 import com.amazonaws.serverless.proxy.jersey.JerseyAwsProxyRequestReader;
+import com.amazonaws.serverless.proxy.jersey.JerseyLambdaContainerHandler;
 
 import org.glassfish.hk2.api.Factory;
 
@@ -64,8 +66,9 @@ public void dispose(HttpServletRequest httpServletRequest) {
     public static HttpServletRequest getRequest() {
         try {
             AwsProxyHttpServletRequest req =  requestReader.readRequest(JerseyAwsProxyRequestReader.getCurrentRequest(),
-                                             AwsProxySecurityContextWriter.getCurrentContext(),
-                                             JerseyAwsProxyRequestReader.getCurrentLambdaContext());
+                                                                        AwsProxySecurityContextWriter.getCurrentContext(),
+                                                                        JerseyAwsProxyRequestReader.getCurrentLambdaContext(),
+                                                                        JerseyLambdaContainerHandler.getContainerConfig());
             req.setServletContext(new AwsServletContext(JerseyAwsProxyRequestReader.getCurrentLambdaContext(), null));
             return req;
         } catch (InvalidRequestEventException e) {