Fix TestWebApp except testCustomRoutes

Author: aajisaka

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApp.java

@@ -22,22 +22,20 @@
 
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.http.HttpServer2;
 import org.apache.hadoop.yarn.webapp.view.RobotsTextPage;
-import org.glassfish.jersey.servlet.ServletProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.apache.hadoop.thirdparty.com.google.common.base.Splitter;
 import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
 import com.google.inject.Provides;
+import com.google.inject.Scopes;
 import com.google.inject.servlet.GuiceFilter;
 import com.google.inject.servlet.ServletModule;
 
@@ -179,10 +177,7 @@ protected void configureWebAppServlets() {
       // from /* below - that doesn't work.
       String regex = "(?!/" + this.wsName + ")";
       serveRegex(regex).with(DefaultWrapperServlet.class);
-
-      Map<String, String> params = new HashMap<String, String>();
-      params.put(ServletProperties.FILTER_FORWARD_ON_404, "true");
-      filter("/*").through(getWebAppFilterClass(), params);
+      bind(getWebAppFilterClass()).in(Scopes.SINGLETON);
     }
   }
 

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java

@@ -46,6 +46,7 @@
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
 import org.eclipse.jetty.webapp.WebAppContext;
+import org.glassfish.jersey.servlet.ServletProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -404,8 +405,11 @@ public void setup() {
               new String[] {"/*"});
         }
 
+        final Map<String, String> guiceFilterParams = new HashMap<>();
+        guiceFilterParams.put(ServletProperties.FILTER_FORWARD_ON_404, "true");
         HttpServer2.defineFilter(server.getWebAppContext(), "guice",
-          GuiceFilter.class.getName(), null, new String[] { "/*" });
+            GuiceFilter.class.getName(), guiceFilterParams,
+            new String[] { "/*" });
 
         webapp.setConf(conf);
         webapp.setHttpServer(server);