[chore] Drop deprecated jruby.rack.filter.* properties; replaced by init parameters.

Author: chadlwilson

History.md

@@ -10,6 +10,7 @@
 - Drop deprecated `Rack::Handler::Servlet::Env` and `Rack::Handler::Servlet::LazyEnv` types (replaced by `DefaultEnv`)
 - Drop undocumented and deprecated jruby-rack 1.0 backwards compat properties `jruby.runtime.timeout.sec`, `jruby.runtime.initializer.threads`, `jruby.init.serial`, `jruby.rack.request.size.threshold.bytes`
 - Drop deprecated `jruby.rack.ignore.env` property, replaced long ago by `jruby.runtime.env` and optional `jruby.runtime.env.rubyopt`
+- Drop deprecated `jruby.rack.filter.*` properties, replaced long ago by init parameters `addsHtmlToPathInfo` and `verifiesHtmlResource`
 - Drop deprecated `JRuby::Rack::RailsFileSystemLayout` alias for `JRuby::Rack::FileSystemLayout`
 - Drop deprecated `JRuby::Rack::Errors` alias for `JRuby::Rack::ErrorApp`
 - Drop deprecated `org.jruby.rack.RackInput` alias for `org.jruby.rack.ext.Input` class

README.md

@@ -144,9 +144,14 @@ using is `org.jruby.rack.RackFilter`, the filter supports the following
   gets reset (accepts  values "true", "false" and "buffer" to reset the buffer
   only), by default "true"
 - **addsHtmlToPathInfo** controls whether the .html suffix is added to the URI
-  when checking if the request is for a static page
+  when checking if the request is for a static page. The default behavior for 
+  Rails and many other Ruby applications is to add an *.html* extension to the 
+  resource and attempt to handle it before serving a dynamic request on the 
+  original URI.  However, this behavior may confuse other servlets in your 
+  application that have a wildcard mapping. Defaults to true.
 - **verifiesHtmlResource** used with the previous parameter to make sure the
-  requested static resource exists before adding the .html request URI suffix
+  requested static resource exists before adding the .html request URI suffix.
+  Defaults to false.
 
 The application can also be configured to dispatch through a servlet instead of
 a filter, the servlet class name is `org.jruby.rack.RackServlet`.
@@ -245,20 +250,6 @@ as context init parameters in web.xml or as VM-wide system properties.
   been previously read this leads to a limitation (Rack won't see the POST paras).
   Thus an alternate pure 'servlet' env "conversion" is provided that maps servlet
   parameters (and cookies) directly to Rack params, avoiding Rack's input parsing.
-- `jruby.rack.filter.adds.html`:
-  **deprecated** use `addsHtmlToPathInfo` filter config init parameter.
-  The default behavior for Rails and many other Ruby applications is to add an
-  *.html* extension to the resource and attempt to handle it before serving a
-  dynamic request on the original URI.
-  However, this behavior may confuse other servlets in your application that
-  have a wildcard mapping. Defaults to true.
-- `jruby.rack.filter.verify.resource.exists`:
-  **deprecated** use `verifiesHtmlResource` filter config init parameter.
-  If `jruby.rack.filter.adds.html` is true, then this setting, when true, adds
-  an additional check using `ServletContext#getResource` to verify that the
-  *.html* resource exists. Default is false.
-  (Note that apparently some servers may not implement `getResource` in the way
-  that is expected here, so in that case this setting won't matter.)
 
 ## Initialization
 

src/main/java/org/jruby/rack/RackFilter.java

@@ -57,21 +57,12 @@ public RackFilter(RackDispatcher dispatcher, RackContext context) {
     @Override
     public void init(FilterConfig config) throws ServletException {
         super.init(config);
-        initializeFromConfig(); // configure init parameters the "old" way
-
-        // filter init params are preffered and override context params :
         String value = config.getInitParameter("addsHtmlToPathInfo");
         if ( value != null ) setAddsHtmlToPathInfo(Boolean.parseBoolean(value));
         value = config.getInitParameter("verifiesHtmlResource");
         if ( value != null ) setVerifiesHtmlResource(Boolean.parseBoolean(value));
     }
 
-    private void initializeFromConfig() {
-        final RackConfig rackConfig = getContext().getConfig(); // backward compatibility :
-        addsHtmlToPathInfo = rackConfig.getBooleanProperty("jruby.rack.filter.adds.html", true);
-        verifiesHtmlResource = rackConfig.getBooleanProperty("jruby.rack.filter.verifies.resource", false);
-    }
-
     @Override
     protected void doFilterInternal(
             final RequestCapture requestCapture,