[chore] Drop undocumented & deprecated config properties from jruby-rack 1.0

Author: chadlwilson

History.md

@@ -8,6 +8,7 @@
 - Drop deprecated `RackLogger` string (level) constants
 - Drop `jruby.rack.jruby.version` and `jruby.rack.rack.release` keys from rack `env` Hash
 - 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`
 - 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

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

@@ -86,11 +86,7 @@ public String getRackupPath() {
 
     @Override
     public Integer getRuntimeTimeoutSeconds() {
-        Integer timeout = getPositiveInteger("jruby.runtime.acquire.timeout");
-        if (timeout == null) { // backwards compatibility with 1.0.x :
-            timeout = getPositiveInteger("jruby.runtime.timeout.sec");
-        }
-        return timeout;
+        return getPositiveInteger("jruby.runtime.acquire.timeout");
     }
 
     @Override
@@ -102,27 +98,15 @@ public String[] getRuntimeArguments() {
     @Override
     public Integer getNumInitializerThreads() {
         Number threads = getNumberProperty("jruby.runtime.init.threads");
-        if (threads == null) { // backwards compatibility with 1.0.x :
-            threads = getNumberProperty("jruby.runtime.initializer.threads");
-        }
         return threads != null ? threads.intValue() : null;
     }
 
     @Override
     public boolean isSerialInitialization() {
         Boolean serial = getBooleanProperty("jruby.runtime.init.serial");
-        if (serial == null) { // backwards compatibility with 1.0.x :
-            serial = getBooleanProperty("jruby.init.serial");
-
-            if (serial == null) { // if initializer threads set to <= 0
-                Integer threads = getNumInitializerThreads();
-                if ( threads != null && threads < 0 ) {
-                    serial = Boolean.TRUE;
-                }
-                else {
-                    serial = Boolean.FALSE;
-                }
-            }
+        if (serial == null) { // if initializer threads set to <= 0
+            Integer threads = getNumInitializerThreads();
+            serial = threads != null && threads < 0 ? Boolean.TRUE : Boolean.FALSE;
         }
         return serial;
     }
@@ -232,11 +216,7 @@ public Integer getInitialMemoryBufferSize() {
 
     @Override
     public Integer getMaximumMemoryBufferSize() {
-        Integer max = getPositiveInteger("jruby.rack.request.size.maximum.bytes");
-        if (max == null) { // backwards compatibility with 1.0.x :
-            max = getPositiveInteger("jruby.rack.request.size.threshold.bytes");
-        }
-        return max;
+        return getPositiveInteger("jruby.rack.request.size.maximum.bytes");
     }
 
     @Override

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

@@ -114,11 +114,7 @@ protected void doInit() throws Exception {
         super.doInit();
         final RackConfig config = getConfig();
         // TODO until config.getRuntimeTimeoutSeconds returns an integer :
-        Number timeout = config.getNumberProperty("jruby.runtime.acquire.timeout");
-        if (timeout == null) { // backwards compatibility with 1.0.x :
-            timeout = config.getNumberProperty("jruby.runtime.timeout.sec");
-        }
-        setAcquireTimeout( timeout );
+        setAcquireTimeout( config.getNumberProperty("jruby.runtime.acquire.timeout") );
 
         setInitialSize( config.getInitialRuntimes() );
         setMaximumSize( config.getMaximumRuntimes() );