HADOOP-6337. Updates FilterInitializer class to be more visible, and the init of the class is made to take a Configuration argument. Contributed by Jakob Homan.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@833553 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -10,6 +10,10 @@ Trunk (unreleased changes)
     hadoop-config.sh so that it allows setting java command options for
     JAVA_PLATFORM.  (Koji Noguchi via szetszwo)
 
+    HADOOP-6337. Updates FilterInitializer class to be more visible,
+    and the init of the class is made to take a Configuration argument.
+    (Jakob Homan via ddas)
+
   IMPROVEMENTS
 
     HADOOP-6283. Improve the exception messages thrown by

src/java/org/apache/hadoop/http/FilterInitializer.java

@@ -17,6 +17,8 @@
  */
 package org.apache.hadoop.http;
 
+import org.apache.hadoop.conf.Configuration;
+
 /**
  * Initialize a javax.servlet.Filter. 
  */
@@ -24,6 +26,7 @@ public abstract class FilterInitializer {
   /**
    * Initialize a Filter to a FilterContainer.
    * @param container The filter container
+   * @param conf Configuration for run-time parameters
    */
-  abstract void initFilter(FilterContainer container);
+  public abstract void initFilter(FilterContainer container, Configuration conf);
 }

src/java/org/apache/hadoop/http/HttpServer.java

@@ -127,7 +127,7 @@ public HttpServer(String name, String bindAddress, int port,
     final FilterInitializer[] initializers = getFilterInitializers(conf); 
     if (initializers != null) {
       for(FilterInitializer c : initializers) {
-        c.initFilter(this);
+        c.initFilter(this, conf);
       }
     }
     addDefaultServlets();

src/test/core/org/apache/hadoop/http/TestGlobalFilter.java

@@ -68,7 +68,7 @@ public void doFilter(ServletRequest request, ServletResponse response,
     static public class Initializer extends FilterInitializer {
       public Initializer() {}
 
-      void initFilter(FilterContainer container) {
+      public void initFilter(FilterContainer container, Configuration conf) {
         container.addGlobalFilter("recording", RecordingFilter.class.getName(), null);
       }
     }

src/test/core/org/apache/hadoop/http/TestServletFilter.java

@@ -66,7 +66,7 @@ public void doFilter(ServletRequest request, ServletResponse response,
     static public class Initializer extends FilterInitializer {
       public Initializer() {}
 
-      void initFilter(FilterContainer container) {
+      public void initFilter(FilterContainer container, Configuration conf) {
         container.addFilter("simple", SimpleFilter.class.getName(), null);
       }
     }