Still flying blind, move Spark filter initialization to constructor of the embedded server object

Author: sapessi

aws-serverless-java-container-spark/src/main/java/com/amazonaws/serverless/proxy/spark/embeddedserver/LambdaEmbeddedServer.java

@@ -38,6 +38,9 @@ public class LambdaEmbeddedServer
         applicationRoutes = routes;
         staticFilesConfiguration = filesConfig;
         hasMultipleHandler = multipleHandlers;
+
+        // try to initialize the filter here.
+        sparkFilter = new MatcherFilter(applicationRoutes, staticFilesConfiguration, true, hasMultipleHandler);
     }
 
 
@@ -48,7 +51,10 @@ public class LambdaEmbeddedServer
     public int ignite(String s, int i, SslStores sslStores, int i1, int i2, int i3)
             throws Exception {
         log.info("Starting Spark server, ignoring port and host");
-        sparkFilter = new MatcherFilter(applicationRoutes, staticFilesConfiguration, false, hasMultipleHandler);
+        // if not initialized yet
+        if (sparkFilter == null) {
+            sparkFilter = new MatcherFilter(applicationRoutes, staticFilesConfiguration, true, hasMultipleHandler);
+        }
 
         return i;
     }

aws-serverless-java-container-spark/src/test/java/com/amazonaws/serverless/proxy/spark/SparkLambdaContainerHandlerTest.java

@@ -35,7 +35,7 @@ public void filters_onStartupMethod_executeFilters() {
             e.printStackTrace();
             fail();
         }
-        
+
         handler.onStartup(c -> {
             if (c == null) {
                 System.out.println("Null servlet context");