[chore] Drop/rename long-deprecated methods from Java API

Author: chadlwilson

History.md

@@ -12,12 +12,12 @@
 - Drop deprecated `jruby.rack.ignore.env` property, replaced long ago by `jruby.runtime.env` and optional `jruby.runtime.env.rubyopt`
 - 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
+- Drop/rename deprecated `RackConfig` and `ServletRackEnvironment` API methods per their earlier comments
 - Change context listener to throw, in case of an exception during initialization, by default
 - Change rails context listener to assume a thread-safe application by default
-- update (bundled) rack to 2.2.17
-- Fix Rails 7.1 CSRF protection when working with `JavaServletStore` sessions
 
-## 1.2.4 (UNRELEASED)
+## 1.2.4
 
 - update (bundled) rack to 2.2.17
 - Fix Rails 7.1 CSRF protection when working with `JavaServletStore` sessions

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

@@ -62,7 +62,7 @@ public final void doFilter(
         // NOTE: should be moved bellow, just before getDispatcher().process(...)
         RackResponseEnvironment responseEnv = new ServletRackResponseEnvironment(httpResponse);
 
-        if (isDoDispatch(requestCapture, responseCapture, chain, env, responseEnv)) {
+        if (isDoDispatch(requestCapture, responseCapture, chain, env)) {
             getDispatcher().process(env, responseEnv);
         }
 
@@ -99,26 +99,6 @@ protected boolean isDoDispatch(
         return true;
     }
 
-    /**
-     * @deprecated use {@link #isDoDispatch(RequestCapture, ResponseCapture, FilterChain, RackEnvironment)}
-     * @param request the request
-     * @param response the response
-     * @param chain the FilterChain
-     * @param env the RackEnvironent
-     * @param responseEnv the RackResponseEnvironment
-     * @return isDoDispatch
-     * @throws IOException if there's an IO exception
-     * @throws ServletException if there's a servlet exception
-     */
-    @Deprecated
-    protected boolean isDoDispatch(
-            RequestCapture request, ResponseCapture response,
-            FilterChain chain, RackEnvironment env,
-            RackResponseEnvironment responseEnv)
-            throws IOException, ServletException {
-        return isDoDispatch(request, response, chain, env);
-    }
-
     /**
      * Extension point if you'll need to customize {@link RequestCapture}
      * @param request the request

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

@@ -28,7 +28,6 @@
  * @see System#getProperty(String)
  * @see RackConfig
  */
-@SuppressWarnings("deprecation")
 public class DefaultRackConfig implements RackConfig {
 
     private RackLogger logger;
@@ -85,7 +84,7 @@ public String getRackupPath() {
     }
 
     @Override
-    public Integer getRuntimeTimeoutSeconds() {
+    public Integer getRuntimeAcquireTimeout() {
         return getPositiveInteger("jruby.runtime.acquire.timeout");
     }
 
@@ -96,7 +95,7 @@ public String[] getRuntimeArguments() {
     }
 
     @Override
-    public Integer getNumInitializerThreads() {
+    public Integer getRuntimeInitThreads() {
         Number threads = getNumberProperty("jruby.runtime.init.threads");
         return threads != null ? threads.intValue() : null;
     }
@@ -105,7 +104,7 @@ public Integer getNumInitializerThreads() {
     public boolean isSerialInitialization() {
         Boolean serial = getBooleanProperty("jruby.runtime.init.serial");
         if (serial == null) { // if initializer threads set to <= 0
-            Integer threads = getNumInitializerThreads();
+            Integer threads = getRuntimeInitThreads();
             serial = threads != null && threads < 0 ? Boolean.TRUE : Boolean.FALSE;
         }
         return serial;
@@ -174,15 +173,6 @@ protected RackLogger defaultLogger() {
         return new StandardOutLogger(getOut());
     }
 
-    @Override
-    public boolean isFilterAddsHtml() {
-        return getBooleanProperty("jruby.rack.filter.adds.html", true);
-    }
-
-    @Override
-    public boolean isFilterVerifiesResource() {
-        return getBooleanProperty("jruby.rack.filter.verifies.resource", false);
-    }
 
     public String getLoggerName() {
         return getProperty("jruby.rack.logging.name", "jruby.rack");

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

@@ -113,9 +113,7 @@ public void setAcquireTimeout(Number acquireTimeout) {
     protected void doInit() throws Exception {
         super.doInit();
         final RackConfig config = getConfig();
-        // TODO until config.getRuntimeTimeoutSeconds returns an integer :
-        setAcquireTimeout( config.getNumberProperty("jruby.runtime.acquire.timeout") );
-
+        setAcquireTimeout( config.getRuntimeAcquireTimeout() );
         setInitialSize( config.getInitialRuntimes() );
         setMaximumSize( config.getMaximumRuntimes() );
 
@@ -264,27 +262,17 @@ public void fillInitialPool() throws RackInitializationException {
         permits = maximumSize != null ? new Semaphore(maximumSize, true) : null;
         if (initialSize != null) { // otherwise pool filled on demand
             Queue<RackApplication> apps = createApplications();
-            launchInitializerThreads(apps);
+            launchInitialization(apps);
             waitTillPoolReady();
         }
     }
 
-    /**
-     * @param apps a queue of apps
-     * @deprecated override {@link #launchInitialization(java.util.Queue)}
-     */
-    @Deprecated
-    protected void launchInitializerThreads(final Queue<RackApplication> apps) {
-        launchInitialization(apps);
-    }
-
     /**
      * Launches application initialization.
      * @param apps the (initial) instances (for the pool) to be initialized
      */
     protected void launchInitialization(final Queue<RackApplication> apps) {
-        @SuppressWarnings("deprecation")
-        Integer initThreads = getConfig().getNumInitializerThreads();
+        Integer initThreads = getConfig().getRuntimeInitThreads();
         if ( initThreads == null ) initThreads = 4; // quad-core baby
 
         for (int i = 0; i < initThreads; i++) {

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

@@ -58,10 +58,6 @@ public RackApplicationFactory getDelegate() {
         return delegate;
     }
 
-    @Deprecated
-    public RackApplicationFactory getRealFactory() {
-        return getDelegate();
-    }
 
     public RackContext getContext() {
         return context;

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

@@ -82,16 +82,14 @@ public interface RackConfig {
      *
      * @return the amount of time before runtimes acquisition times out
      */
-    @Deprecated // TODO rename to Float getRuntimeAquireTimeout
-    Integer getRuntimeTimeoutSeconds();
+    Integer getRuntimeAcquireTimeout();
 
     /**
      * Get the number of initializer threads, or null if unspecified.
      *
      * @return the number of initializer threads or null
      */
-    @Deprecated // TODO rename to Integer getRuntimeInitThreads
-    Integer getNumInitializerThreads();
+    Integer getRuntimeInitThreads();
 
     /** 
      * Return true if runtimes should be initialized in serial 
@@ -132,29 +130,8 @@ public interface RackConfig {
      * @return a logger instance
      */
     RackLogger getLogger();
-    
-    /** 
-     * Return true if passing through the filter should append '.html' 
-     * (or 'index.html') to the path.
-     *
-     * @return true if the filter should append .html
-     * @deprecated configure filter with a nested init-param
-     * @see RackFilter
-     */
-    @Deprecated
-    boolean isFilterAddsHtml();
 
-    /** 
-     * Return true if filter should verify the resource exists using 
-     * ServletContext#getResource before adding .html on the request. 
-     *
-     * @return true if the filter should verify the resource
-     * @deprecated configure filter with a nested init-param
-     * @see RackFilter
-     */
-    @Deprecated
-    boolean isFilterVerifiesResource();
-        /**
+    /**
      * General property retrieval for custom configuration values.
      *
      * @param key the key

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

@@ -120,13 +120,4 @@ public interface RackResponseEnvironment {
      */
     PrintWriter getWriter() throws IOException ;
 
-    /**
-     * @see RackResponse#respond(RackResponseEnvironment)
-     * @param response the response
-     * @throws IOException if there's an IO exception
-     * @deprecated (should) no longer (be) used
-     */
-    @Deprecated
-    void defaultRespond(RackResponse response) throws IOException ;
-
 }

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

@@ -161,8 +161,8 @@ public String getRackupPath() {
     // runtime pooling in embedded ENVs not implemented :
 
     @Override
-    public Integer getRuntimeTimeoutSeconds() {
-        throw new UnsupportedOperationException("getRuntimeTimeoutSeconds()");
+    public Integer getRuntimeAcquireTimeout() {
+        throw new UnsupportedOperationException("getRuntimeAcquireTimeout()");
     }
 
     @Override
@@ -181,8 +181,8 @@ public String[] getRuntimeArguments() {
     }
 
     @Override
-    public Integer getNumInitializerThreads() {
-        throw new UnsupportedOperationException("getNumInitializerThreads()");
+    public Integer getRuntimeInitThreads() {
+        throw new UnsupportedOperationException("getRuntimeInitThreads()");
     }
 
     @Override
@@ -194,17 +194,4 @@ public boolean isSerialInitialization() {
     public Map<String, String> getRuntimeEnvironment() {
         throw new UnsupportedOperationException("getRuntimeEnvironment()");
     }
-
-    // RackFilter aint's used with embed :
-
-    @Override
-    public boolean isFilterAddsHtml() {
-        throw new UnsupportedOperationException("isFilterAddsHtml()");
-    }
-
-    @Override
-    public boolean isFilterVerifiesResource() {
-        throw new UnsupportedOperationException("isFilterVerifiesResource()");
-    }
-
 }

src/main/java/org/jruby/rack/embed/Config.java

@@ -53,7 +53,6 @@ public static void load(final Ruby runtime) {
               "Input", _Object, Input.ALLOCATOR
         );
         _Input.defineAnnotatedMethods(Input.class);
-        _JRuby.setConstant("RackInput", _Input); // @deprecated backwards-compat
 
         // JRuby::Rack::Logger
         final RubyClass _Logger = _JRuby_Rack.defineClassUnder(