[chore] Tidy code for modern Java versions

chadlwilson · chadlwilson · commit 003342ea6ac3 · 2026-04-22T00:38:30.000+08:00
Addresses some deprecations in JRuby that have been removed in 10.1. (cherry picked from commit d633632 - excludes generics change to interfaces)
diff --git a/src/main/java/org/jruby/rack/DefaultErrorApplication.java b/src/main/java/org/jruby/rack/DefaultErrorApplication.java
@@ -75,8 +75,7 @@ static Exception getException(RackEnvironment env) {
     private class Response implements RackResponse {
 
         private int status = 500;
-        @SuppressWarnings("rawtypes")
-        private Map headers = Collections.EMPTY_MAP;
+        private Map<String, ?> headers = Collections.emptyMap();
         private String body;
 
         protected final RackEnvironment env;
@@ -99,9 +98,9 @@ public Map getHeaders() {
             return headers;
         }
 
-        @SuppressWarnings("unused")
+        @SuppressWarnings({"unused", "unchecked"})
         public void setHeaders(@SuppressWarnings("rawtypes") Map headers) {
-            this.headers = headers == null ? Collections.EMPTY_MAP : headers;
+            this.headers = headers == null ? Collections.emptyMap() : headers;
         }
 
         @Override
diff --git a/src/main/java/org/jruby/rack/DefaultRackApplication.java b/src/main/java/org/jruby/rack/DefaultRackApplication.java
@@ -50,13 +50,8 @@ public RackResponse call(final RackEnvironment env) {
         final IRubyObject app = getApplication();
         final Ruby runtime = getRuntime();
         final IRubyObject servlet_env = JavaEmbedUtils.javaToRuby(runtime, env);
-        //try { // app.call(env) :
         final IRubyObject response = app.callMethod(runtime.getCurrentContext(), "call", servlet_env);
-        return (RackResponse) response.toJava(RackResponse.class);
-        //}
-        //catch (RuntimeException e) {
-        //    throw ExceptionUtils.wrapException(runtime, e);
-        //}
+        return response.toJava(RackResponse.class);
     }
 
     @Override
diff --git a/src/main/java/org/jruby/rack/DefaultRackApplicationFactory.java b/src/main/java/org/jruby/rack/DefaultRackApplicationFactory.java
@@ -202,7 +202,7 @@ public IRubyObject createErrorApplicationObject(final Ruby runtime) {
 
     public RackApplication newErrorApplication() {
         Boolean error = rackContext.getConfig().getBooleanProperty("jruby.rack.error");
-        if ( error != null && ! error.booleanValue() ) { // jruby.rack.error = false
+        if ( error != null && !error) { // jruby.rack.error = false
             return new DefaultErrorApplication(rackContext);
         }
         try {
@@ -585,7 +585,7 @@ private void configureDefaults() {
         if (iniSize == null) iniSize = RewindableInputStream.INI_BUFFER_SIZE;
         Integer maxSize = config.getMaximumMemoryBufferSize();
         if (maxSize == null) maxSize = RewindableInputStream.MAX_BUFFER_SIZE;
-        if (iniSize.intValue() > maxSize.intValue()) iniSize = maxSize;
+        if (iniSize > maxSize) iniSize = maxSize;
 
         RewindableInputStream.setDefaultInitialBufferSize(iniSize);
         RewindableInputStream.setDefaultMaximumBufferSize(maxSize);
diff --git a/src/main/java/org/jruby/rack/DefaultRackConfig.java b/src/main/java/org/jruby/rack/DefaultRackConfig.java
@@ -130,7 +130,7 @@ public boolean isSerialInitialization() {
                 }
             }
         }
-        return serial.booleanValue();
+        return serial;
     }
 
     @Override
@@ -282,8 +282,7 @@ public Map<String, String> getRuntimeEnvironment() {
     static boolean isIgnoreRUBYOPT(RackConfig config) {
         // RUBYOPT ignored if jruby.runtime.env.rubyopt = false
         Boolean rubyopt = config.getBooleanProperty("jruby.runtime.env.rubyopt");
-        if ( rubyopt == null ) return ! config.isIgnoreEnvironment();
-        return rubyopt != null && ! rubyopt.booleanValue();
+        return rubyopt == null ? !config.isIgnoreEnvironment() : !rubyopt;
     }
 
     @Override
@@ -297,14 +296,11 @@ public boolean isThrowInitException() {
 
     static boolean isThrowInitException(RackConfig config) {
         Boolean error = config.getBooleanProperty("jruby.rack.error");
-        if ( error != null && ! error.booleanValue() ) {
+        if ( error != null && !error) {
             return true; // jruby.rack.error = false
         }
         error = config.getBooleanProperty("jruby.rack.exception");
-        if ( error != null && ! error.booleanValue() ) {
-            return true; // jruby.rack.exception = false
-        }
-        return false;
+        return error != null && !error; // jruby.rack.exception = false
     }
 
     @Override
@@ -350,7 +346,7 @@ private Integer getPositiveInteger(String key) {
         if (value == null) return null;
         try {
             int i = Integer.parseInt(value);
-            if (i > 0) return Integer.valueOf(i);
+            if (i > 0) return i;
         } catch (Exception e) { /* ignored */ }
         return null;
     }
@@ -382,12 +378,12 @@ public static Number toNumber(String value, Number defaultValue) {
             }
             if ( number == ((int) number) )
             if ( number > Integer.MAX_VALUE ) {
-                return Long.valueOf((long) number);
+                return (long) number;
             }
             else {
-                return Integer.valueOf((int) number);
+                return (int) number;
             }
-            return Float.valueOf(number);
+            return number;
         }
         catch (Exception e) { /* ignored */ }
         return defaultValue;
@@ -409,7 +405,7 @@ private Map<String, String> toStringMap(final String env) {
                 for ( final String entry : entries ) {
                     String[] pair = entry.split("=", 2);
                     if ( pair.length == 1 ) { // no = separator
-                        if ( entry.trim().length() == 0 ) continue;
+                        if ( entry.trim().isEmpty() ) continue;
                         if ( lastKey == null ) continue; // missing key
                         map.put( lastKey, lastVal = lastVal + ',' + entry );
                     }
diff --git a/src/main/java/org/jruby/rack/DefaultRackDispatcher.java b/src/main/java/org/jruby/rack/DefaultRackDispatcher.java
@@ -55,7 +55,7 @@ protected void afterException(
             // TODO seems redundant maybe we should let the container decide ?!
             context.log(RackLogger.ERROR, "error app failed to handle exception: " + e, re);
             Integer errorCode = getErrorApplicationFailureStatusCode();
-            if ( errorCode != null && errorCode.intValue() > 0 ) {
+            if ( errorCode != null && errorCode > 0 ) {
                 response.sendError(errorCode);
             }
             else {
diff --git a/src/main/java/org/jruby/rack/PoolingRackApplicationFactory.java b/src/main/java/org/jruby/rack/PoolingRackApplicationFactory.java
@@ -390,14 +390,14 @@ private int getInitialPoolSizeWait() {
         if ( waitNum != null ) {
             int wait = waitNum.intValue();
             if (maximumSize != null && wait > maximumSize) {
-                wait = maximumSize.intValue();
+                wait = maximumSize;
             }
             return wait;
         }
         // otherwise we assume it to be a boolean true/false flag :
         Boolean waitFlag = getConfig().getBooleanProperty("jruby.runtime.init.wait");
         if ( waitFlag == null ) waitFlag = Boolean.TRUE;
-        return waitFlag ? ( initialSize == null ? 1 : initialSize.intValue() ) : 0;
+        return waitFlag ? ( initialSize == null ? 1 : initialSize) : 0;
         // NOTE: this slightly changes the behavior in 1.1.8, in previous
         // versions the initialization only waited for 1 application instance
         // to be available in the pool - here by default we wait till initial
@@ -406,7 +406,7 @@ private int getInitialPoolSizeWait() {
 
     @Override
     public Collection<RackApplication> getManagedApplications() {
-        int initSize = initialSize != null ? initialSize.intValue() : -1;
+        int initSize = initialSize != null ? initialSize : -1;
         synchronized (applicationPool) {
             if ( applicationPool.isEmpty() ) {
                 if ( initSize > 0 ) return null; // ~ init error
diff --git a/src/main/java/org/jruby/rack/UnmappedRackFilter.java b/src/main/java/org/jruby/rack/UnmappedRackFilter.java
@@ -8,10 +8,8 @@
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
+import java.util.stream.Collectors;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;
@@ -46,7 +44,7 @@ public class UnmappedRackFilter extends AbstractFilter {
 
     private static final Collection<Integer> RESPONSE_NOT_HANDLED_STATUSES;
     static {
-        final HashSet<Integer> statuses = new HashSet<>(8, 1);
+        final Set<Integer> statuses = new HashSet<>(8, 1);
         statuses.add( 404 );
         // 403 due containers not supporting PUT/DELETE correctly (Tomcat 6)
         statuses.add( 403 );
@@ -61,7 +59,7 @@ public class UnmappedRackFilter extends AbstractFilter {
     private RackContext context;
     private RackDispatcher dispatcher;
 
-    public UnmappedRackFilter() { /** constructor used by container */ }
+    public UnmappedRackFilter() { /* constructor used by container */ }
 
     /**
      * Dependency-injected constructor for testing
@@ -89,14 +87,11 @@ public void init(FilterConfig config) throws ServletException {
         // ResponseCapture.notHandledStatuses e.g. "403,404,500"
         value = config.getInitParameter("responseNotHandledStatuses");
         if ( value != null ) {
-            final Set<Integer> statuses = new HashSet<>();
-            for ( String status : value.split(",") ) {
-                status = status.trim();
-                if ( status.length() > 0 ) {
-                    statuses.add( Integer.parseInt(status) );
-                }
-            }
-            responseNotHandledStatuses = statuses;
+            responseNotHandledStatuses = Arrays.stream(value.split(","))
+                    .map(String::trim)
+                    .filter(status -> !status.isEmpty())
+                    .map(Integer::parseInt)
+                    .collect(Collectors.toSet());
         }
         // ResponseCapture.handledByDefault true/false (true by default)
         value = config.getInitParameter("responseHandledByDefault");
@@ -180,7 +175,7 @@ public boolean isResetUnhandledResponse() {
     }
 
     public void setResetUnhandledResponse(boolean reset) {
-        this.resetUnhandledResponse = Boolean.valueOf(reset);
+        this.resetUnhandledResponse = reset;
     }
 
     public boolean isResetUnhandledResponseBuffer() {
@@ -204,10 +199,9 @@ public Collection<Integer> getResponseNotHandledStatuses() {
         return this.responseNotHandledStatuses;
     }
 
-    @SuppressWarnings("unchecked")
     public void setDefaultNotHandledStatuses(final Collection<Integer> responseNotHandledStatuses) {
         this.responseNotHandledStatuses =
-            responseNotHandledStatuses == null ? Collections.EMPTY_SET : responseNotHandledStatuses;
+            responseNotHandledStatuses == null ? Collections.emptySet() : responseNotHandledStatuses;
     }
 
     public boolean isResponseHandledByDefault() {
diff --git a/src/main/java/org/jruby/rack/ext/Response.java b/src/main/java/org/jruby/rack/ext/Response.java
@@ -50,12 +50,12 @@
 import org.jruby.rack.RackException;
 import org.jruby.rack.RackResponse;
 import org.jruby.rack.RackResponseEnvironment;
-import org.jruby.runtime.Arity;
 import org.jruby.runtime.Block;
 import org.jruby.runtime.BlockBody;
 import org.jruby.runtime.Helpers;
 import org.jruby.runtime.JavaInternalBlockBody;
 import org.jruby.runtime.ObjectAllocator;
+import org.jruby.runtime.Signature;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.Visibility;
 import org.jruby.runtime.builtin.IRubyObject;
@@ -93,7 +93,7 @@ public static IRubyObject is_swallow_client_abort(final ThreadContext context, f
     @JRubyMethod(name = "swallow_client_abort=", meta = true, required = 1)
     public static IRubyObject set_swallow_client_abort(final IRubyObject self, final IRubyObject value) {
         if ( value instanceof RubyBoolean ) {
-            swallowClientAbort = ((RubyBoolean) value).isTrue();
+            swallowClientAbort = value.isTrue();
         }
         else {
             swallowClientAbort = ! value.isNil();
@@ -124,7 +124,7 @@ public static IRubyObject is_dechunk(final ThreadContext context, final IRubyObj
     @JRubyMethod(name = "dechunk=", meta = true, required = 1)
     public static IRubyObject set_dechunk(final IRubyObject self, final IRubyObject value) {
         if ( value instanceof RubyBoolean ) {
-            dechunk = ((RubyBoolean) value).isTrue();
+            dechunk = value.isTrue();
         }
         else {
             dechunk = ! value.isNil();
@@ -138,7 +138,7 @@ public static IRubyObject set_dechunk(final IRubyObject self, final IRubyObject
      * Returns the channel chunk size to be used e.g. when a (send) file
      * response is detected. By setting this value to nil you force an "explicit"
      * byte buffer to be used when copying between channels.
-     *
+     * <p>
      * Note: High values won't hurt when sending small files since most Java
      * (file) channel implementations handle this gracefully. However if you're
      * on Windows it is  recommended to not set this higher than the "magic"
@@ -169,7 +169,7 @@ public static IRubyObject set_channel_chunk_size(final IRubyObject self, final I
         }
         else {
             final long val = value.convertToInteger("to_i").getLongValue();
-            channelChunkSize = Integer.valueOf((int) val);
+            channelChunkSize = (int) val;
         }
         return value;
     }
@@ -204,7 +204,7 @@ public static IRubyObject set_channel_buffer_size(final IRubyObject self, final
         }
         else {
             final long val = value.convertToInteger("to_i").getLongValue();
-            channelBufferSize = Integer.valueOf((int) val);
+            channelBufferSize = (int) val;
         }
         return value;
     }
@@ -228,7 +228,7 @@ protected Response(Ruby runtime, RubyClass metaClass) {
     @JRubyMethod(required = 1)
     public IRubyObject initialize(final ThreadContext context, final IRubyObject arg) {
         if ( arg instanceof RubyArray ) {
-            final RubyArray arr = (RubyArray) arg;
+            final RubyArray<?> arr = (RubyArray<?>) arg;
             if ( arr.size() < 3 ) {
                 throw context.runtime.newArgumentError("expected 3 array elements (rack-respose)");
             }
@@ -297,10 +297,10 @@ public String getBody() {
         try {
             final StringBuilder bodyParts = new StringBuilder();
             invoke(context, this.body, "each",
-                new JavaInternalBlockBody(context.runtime, Arity.ONE_REQUIRED) {
+                new JavaInternalBlockBody(context.runtime, Signature.ONE_REQUIRED) {
                     @Override
                     public IRubyObject yield(ThreadContext context, IRubyObject[] args) {
-                        return yield(context, args[0]);
+                        return this.yield(context, args[0]);
                     }
 
                     @Override
@@ -347,7 +347,7 @@ public void respond(final RackResponseEnvironment response) throws RackException
 
     @JRubyMethod(name = "write_status")
     public IRubyObject write_status(final ThreadContext context, final IRubyObject response) {
-        writeStatus( (RackResponseEnvironment) response.toJava(RackResponseEnvironment.class) );
+        writeStatus(response.toJava(RackResponseEnvironment.class));
         return context.nil;
     }
 
@@ -358,7 +358,7 @@ protected void writeStatus(final RackResponseEnvironment response) {
     @JRubyMethod(name = "write_headers")
     public IRubyObject write_headers(final ThreadContext context, final IRubyObject response)
         throws IOException {
-        writeHeaders( (RackResponseEnvironment) response.toJava(RackResponseEnvironment.class) );
+        writeHeaders(response.toJava(RackResponseEnvironment.class));
         return context.nil;
     }
 
@@ -394,10 +394,10 @@ public void visit(final IRubyObject key, final IRubyObject val) {
                     final RubyString newLine = RubyString.newString(context.runtime, NEW_LINE);
                     // value.each_line { |val| response.addHeader(key.to_s, val.chomp("\n")) }
                     invoke(context, val, each_line ? "each_line" : "each",
-                        new JavaInternalBlockBody(context.runtime, Arity.ONE_REQUIRED) {
+                        new JavaInternalBlockBody(context.runtime, Signature.ONE_REQUIRED) {
                             @Override
                             public IRubyObject yield(ThreadContext context, IRubyObject[] args) {
-                                return yield(context, args[0]);
+                                return this.yield(context, args[0]);
                             }
 
                             @Override
@@ -430,7 +430,7 @@ else if ( val instanceof RubyTime ) {
     @JRubyMethod(name = "write_body")
     public IRubyObject write_body(final ThreadContext context, final IRubyObject response)
         throws IOException {
-        writeBody( (RackResponseEnvironment) response.toJava(RackResponseEnvironment.class) );
+        writeBody(response.toJava(RackResponseEnvironment.class));
         return context.nil;
     }
 
@@ -463,7 +463,7 @@ protected void writeBody(final RackResponseEnvironment response) throws IOExcept
                 else {
                     final ThreadContext context = currentContext();
                     final IRubyObject channel = body.callMethod(context, "to_channel");
-                    bodyChannel = (Channel) channel.toJava(Channel.class);
+                    bodyChannel = channel.toJava(Channel.class);
                 }
                 if ( bodyChannel instanceof FileChannel ) {
                     transferChannel( (FileChannel) bodyChannel, response.getOutputStream() );
@@ -486,10 +486,10 @@ protected void writeBody(final RackResponseEnvironment response) throws IOExcept
                 final String method = body.respondsTo("each_line") ? "each_line" : "each";
                 try {
                     invoke(context, body, method,
-                        new JavaInternalBlockBody(context.runtime, Arity.ONE_REQUIRED) {
+                        new JavaInternalBlockBody(context.runtime, Signature.ONE_REQUIRED) {
                         @Override
                         public IRubyObject yield(ThreadContext context, IRubyObject[] args) {
-                            return yield(context, args[0]);
+                            return this.yield(context, args[0]);
                         }
 
                         @Override
diff --git a/src/main/java/org/jruby/rack/servlet/RequestCapture.java b/src/main/java/org/jruby/rack/servlet/RequestCapture.java
@@ -155,7 +155,7 @@ private boolean parseRequestParams() {
                     }
                     params.put(key, newValues);
                 }
-            } catch (UnsupportedEncodingException e) { /* UTF-8 should be fine */ }
+            } catch (UnsupportedEncodingException ignore) { /* UTF-8 should be fine */ }
         }
         
         this.requestParams = params;
diff --git a/src/main/java/org/jruby/rack/servlet/ResponseCapture.java b/src/main/java/org/jruby/rack/servlet/ResponseCapture.java
diff --git a/src/main/java/org/jruby/rack/servlet/ServletRackEnvironment.java b/src/main/java/org/jruby/rack/servlet/ServletRackEnvironment.java

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ public boolean isSerialInitialization() {`
`130`	`130`	`}`
`131`	`131`	`}`
`132`	`132`	`}`
`133`		`- return serial.booleanValue();`
	`133`	`+ return serial;`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`@Override`
`@@ -282,8 +282,7 @@ public Map<String, String> getRuntimeEnvironment() {`
`282`	`282`	`static boolean isIgnoreRUBYOPT(RackConfig config) {`
`283`	`283`	`// RUBYOPT ignored if jruby.runtime.env.rubyopt = false`
`284`	`284`	`Boolean rubyopt = config.getBooleanProperty("jruby.runtime.env.rubyopt");`
`285`		`- if ( rubyopt == null ) return ! config.isIgnoreEnvironment();`
`286`		`- return rubyopt != null && ! rubyopt.booleanValue();`
	`285`	`+ return rubyopt == null ? !config.isIgnoreEnvironment() : !rubyopt;`
`287`	`286`	`}`
`288`	`287`
`289`	`288`	`@Override`
`@@ -297,14 +296,11 @@ public boolean isThrowInitException() {`
`297`	`296`
`298`	`297`	`static boolean isThrowInitException(RackConfig config) {`
`299`	`298`	`Boolean error = config.getBooleanProperty("jruby.rack.error");`
`300`		`- if ( error != null && ! error.booleanValue() ) {`
	`299`	`+ if ( error != null && !error) {`
`301`	`300`	`return true; // jruby.rack.error = false`
`302`	`301`	`}`
`303`	`302`	`error = config.getBooleanProperty("jruby.rack.exception");`
`304`		`- if ( error != null && ! error.booleanValue() ) {`
`305`		`- return true; // jruby.rack.exception = false`
`306`		`- }`
`307`		`- return false;`
	`303`	`+ return error != null && !error; // jruby.rack.exception = false`
`308`	`304`	`}`
`309`	`305`
`310`	`306`	`@Override`
`@@ -350,7 +346,7 @@ private Integer getPositiveInteger(String key) {`
`350`	`346`	`if (value == null) return null;`
`351`	`347`	`try {`
`352`	`348`	`int i = Integer.parseInt(value);`
`353`		`- if (i > 0) return Integer.valueOf(i);`
	`349`	`+ if (i > 0) return i;`
`354`	`350`	`} catch (Exception e) { /* ignored */ }`
`355`	`351`	`return null;`
`356`	`352`	`}`
`@@ -382,12 +378,12 @@ public static Number toNumber(String value, Number defaultValue) {`
`382`	`378`	`}`
`383`	`379`	`if ( number == ((int) number) )`
`384`	`380`	`if ( number > Integer.MAX_VALUE ) {`
`385`		`- return Long.valueOf((long) number);`
	`381`	`+ return (long) number;`
`386`	`382`	`}`
`387`	`383`	`else {`
`388`		`- return Integer.valueOf((int) number);`
	`384`	`+ return (int) number;`
`389`	`385`	`}`
`390`		`- return Float.valueOf(number);`
	`386`	`+ return number;`
`391`	`387`	`}`
`392`	`388`	`catch (Exception e) { /* ignored */ }`
`393`	`389`	`return defaultValue;`
`@@ -409,7 +405,7 @@ private Map<String, String> toStringMap(final String env) {`
`409`	`405`	`for ( final String entry : entries ) {`
`410`	`406`	`String[] pair = entry.split("=", 2);`
`411`	`407`	`if ( pair.length == 1 ) { // no = separator`
`412`		`- if ( entry.trim().length() == 0 ) continue;`
	`408`	`+ if ( entry.trim().isEmpty() ) continue;`
`413`	`409`	`if ( lastKey == null ) continue; // missing key`
`414`	`410`	`map.put( lastKey, lastVal = lastVal + ',' + entry );`
`415`	`411`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ protected void afterException(`
`55`	`55`	`// TODO seems redundant maybe we should let the container decide ?!`
`56`	`56`	`context.log(RackLogger.ERROR, "error app failed to handle exception: " + e, re);`
`57`	`57`	`Integer errorCode = getErrorApplicationFailureStatusCode();`
`58`		`- if ( errorCode != null && errorCode.intValue() > 0 ) {`
	`58`	`+ if ( errorCode != null && errorCode > 0 ) {`
`59`	`59`	`response.sendError(errorCode);`
`60`	`60`	`}`
`61`	`61`	`else {`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ private boolean parseRequestParams() {`
`155`	`155`	`}`
`156`	`156`	`params.put(key, newValues);`
`157`	`157`	`}`
`158`		`- } catch (UnsupportedEncodingException e) { /* UTF-8 should be fine */ }`
	`158`	`+ } catch (UnsupportedEncodingException ignore) { /* UTF-8 should be fine */ }`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`this.requestParams = params;`