Do not require refreshContext variable in constructor of LambdaSpringApplicationInitializer and SpringLambdacontainerHandler. Added setter for refreshContext. Added Spring test dependencies to test scope

Author: joeyvmason

aws-serverless-java-container-spring/pom.xml

@@ -45,11 +45,12 @@
             <version>${spring.version}</version>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/org.springframework/spring-webmvc -->
+        <!-- https://mvnrepository.com/artifact/org.springframework/spring-test -->
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
             <version>${spring.version}</version>
+            <scope>test</scope>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->

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

@@ -45,7 +45,7 @@ public class LambdaSpringApplicationInitializer implements WebApplicationInitial
 
     // Configuration variables that can be passed in
     private ConfigurableWebApplicationContext applicationContext;
-    private boolean refreshContext;
+    private boolean refreshContext = true;
     private List<ServletContextListener> contextListeners;
 
     // Dynamically instantiated properties
@@ -58,12 +58,10 @@ public class LambdaSpringApplicationInitializer implements WebApplicationInitial
     /**
      * Creates a new instance of the WebApplicationInitializer
      * @param applicationContext A custom ConfigurableWebApplicationContext to be used
-     * @param applicationContext Whether or not to refresh the applicationContext
      */
-    public LambdaSpringApplicationInitializer(ConfigurableWebApplicationContext applicationContext, boolean refreshContext) {
+    public LambdaSpringApplicationInitializer(ConfigurableWebApplicationContext applicationContext) {
         this.contextListeners = new ArrayList<>();
         this.applicationContext = applicationContext;
-        this.refreshContext = refreshContext;
     }
 
     /**
@@ -76,6 +74,10 @@ public void addListener(ServletContextListener listener) {
         contextListeners.add(listener);
     }
 
+    public void setRefreshContext(boolean refreshContext) {
+        this.refreshContext = refreshContext;
+    }
+
     public void dispatch(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
         currentResponse = response;

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

@@ -55,8 +55,7 @@ public static SpringLambdaContainerHandler<AwsProxyRequest, AwsProxyResponse> ge
                 new AwsProxyHttpServletResponseWriter(),
                 new AwsProxySecurityContextWriter(),
                 new AwsProxyExceptionHandler(),
-                applicationContext,
-                true
+                applicationContext
         );
     }
 
@@ -66,15 +65,14 @@ public static SpringLambdaContainerHandler<AwsProxyRequest, AwsProxyResponse> ge
      * @return An initialized instance of the `SpringLambdaContainerHandler`
      * @throws ContainerInitializationException
      */
-    public static SpringLambdaContainerHandler<AwsProxyRequest, AwsProxyResponse> getAwsProxyHandler(ConfigurableWebApplicationContext applicationContext, boolean refresh)
+    public static SpringLambdaContainerHandler<AwsProxyRequest, AwsProxyResponse> getAwsProxyHandler(ConfigurableWebApplicationContext applicationContext)
             throws ContainerInitializationException {
         return new SpringLambdaContainerHandler<>(
                 new AwsProxyHttpServletRequestReader(),
                 new AwsProxyHttpServletResponseWriter(),
                 new AwsProxySecurityContextWriter(),
                 new AwsProxyExceptionHandler(),
-                applicationContext,
-                refresh
+                applicationContext
         );
     }
 
@@ -94,29 +92,11 @@ public SpringLambdaContainerHandler(RequestReader<RequestType, AwsProxyHttpServl
                                         ConfigurableWebApplicationContext applicationContext)
             throws ContainerInitializationException {
         super(requestReader, responseWriter, securityContextWriter, exceptionHandler);
-        initializer = new LambdaSpringApplicationInitializer(applicationContext, false);
+        initializer = new LambdaSpringApplicationInitializer(applicationContext);
     }
 
-    /**
-     * Creates a new container handler with the given reader and writer objects
-     *
-     * @param requestReader An implementation of `RequestReader`
-     * @param responseWriter An implementation of `ResponseWriter`
-     * @param securityContextWriter An implementation of `SecurityContextWriter`
-     * @param exceptionHandler An implementation of `ExceptionHandler`
-     * @param applicationContext An implementation of `ConfigurableWebApplicationContext`
-     * @param refreshContext Whether or not applicationContext needs to be refreshed
-     * @throws ContainerInitializationException
-     */
-    public SpringLambdaContainerHandler(RequestReader<RequestType, AwsProxyHttpServletRequest> requestReader,
-                                        ResponseWriter<AwsHttpServletResponse, ResponseType> responseWriter,
-                                        SecurityContextWriter<RequestType> securityContextWriter,
-                                        ExceptionHandler<ResponseType> exceptionHandler,
-                                        ConfigurableWebApplicationContext applicationContext,
-                                        boolean refreshContext)
-            throws ContainerInitializationException {
-        super(requestReader, responseWriter, securityContextWriter, exceptionHandler);
-        initializer = new LambdaSpringApplicationInitializer(applicationContext, refreshContext);
+    public void setRefreshContext(boolean refreshContext) {
+        this.initializer.setRefreshContext(refreshContext);
     }
 
     @Override

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

@@ -21,7 +21,9 @@ public class EchoSpringAppConfig {
 
     @Bean
     public SpringLambdaContainerHandler springLambdaContainerHandler() throws ContainerInitializationException {
-        return SpringLambdaContainerHandler.getAwsProxyHandler(applicationContext, false);
+        SpringLambdaContainerHandler handler = SpringLambdaContainerHandler.getAwsProxyHandler(applicationContext);
+        handler.setRefreshContext(false);
+        return handler;
     }
 
     @Bean