Merge remote-tracking branch 'upstream/master' into jakarta-update

chadlwilson · chadlwilson · commit 9a77f0dc5cbf · 2025-08-10T00:15:58.000+08:00
# Conflicts:
#	src/main/java/org/jruby/rack/embed/Filter.java
diff --git a/src/main/java/org/jruby/rack/DefaultErrorApplication.java b/src/main/java/org/jruby/rack/DefaultErrorApplication.java
@@ -27,7 +27,6 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
@@ -62,14 +61,6 @@ public Ruby getRuntime() {
         throw new UnsupportedOperationException("getRuntime() not supported");
     }
 
-    public void init() {
-        // NOOP
-    }
-
-    public void destroy() {
-        // NOOP
-    }
-
     @Override
     public RackResponse call(RackEnvironment env) throws RackException {
         return new Response(env); // backwards compatibility
diff --git a/src/main/java/org/jruby/rack/DefaultRackApplicationFactory.java b/src/main/java/org/jruby/rack/DefaultRackApplicationFactory.java
@@ -45,7 +45,7 @@ public class DefaultRackApplicationFactory implements RackApplicationFactory {
     private String rackupScript, rackupLocation;
     private ServletRackContext rackContext;
     private RubyInstanceConfig runtimeConfig;
-    private RackApplication errorApplication;
+    private volatile RackApplication errorApplication;
 
     /**
      * Convenience helper for unwrapping a {@link RackApplicationFactoryDecorator}.
@@ -351,7 +351,7 @@ public void initRuntime(final Ruby runtime) {
         String dechunk = rackContext.getConfig().getProperty("jruby.rack.response.dechunk");
         Boolean dechunkFlag = (Boolean) DefaultRackConfig.toStrictBoolean(dechunk, null);
         if ( dechunkFlag != null ) {
-            runtime.evalScriptlet("JRuby::Rack::Response.dechunk = " + dechunkFlag + "");
+            runtime.evalScriptlet("JRuby::Rack::Response.dechunk = " + dechunkFlag);
         }
         else { // dechunk null (default) or not a true/false value ... we're patch :
             runtime.evalScriptlet("JRuby::Rack::Booter.on_boot { require 'jruby/rack/chunked' }");
@@ -360,7 +360,7 @@ public void initRuntime(final Ruby runtime) {
         String swallowAbort = rackContext.getConfig().getProperty("jruby.rack.response.swallow_client_abort");
         Boolean swallowAbortFlag = (Boolean) DefaultRackConfig.toStrictBoolean(swallowAbort, null);
         if ( swallowAbortFlag != null ) {
-            runtime.evalScriptlet("JRuby::Rack::Response.swallow_client_abort = " + swallowAbortFlag + "");
+            runtime.evalScriptlet("JRuby::Rack::Response.swallow_client_abort = " + swallowAbortFlag);
         }
     }
 
diff --git a/src/main/java/org/jruby/rack/DefaultRackConfig.java b/src/main/java/org/jruby/rack/DefaultRackConfig.java
@@ -265,7 +265,7 @@ 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;
+        return !rubyopt;
     }
 
     @Override
@@ -283,10 +283,7 @@ static boolean isThrowInitException(RackConfig config) {
             return false; // jruby.rack.error = true
         }
         error = config.getBooleanProperty(RackEnvironment.EXCEPTION);
-        if ( error != null && error) {
-            return false; // jruby.rack.exception = true
-        }
-        return true;
+        return error == null || !error; // jruby.rack.exception != true
     }
 
     @Override
@@ -391,7 +388,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.isBlank() ) continue;
                         if ( lastKey == null ) continue; // missing key
                         map.put( lastKey, lastVal = lastVal + ',' + entry );
                     }
diff --git a/src/main/java/org/jruby/rack/PoolingRackApplicationFactory.java b/src/main/java/org/jruby/rack/PoolingRackApplicationFactory.java
@@ -168,10 +168,9 @@ else if ( permit && ( initialSize != null &&
                 // could only happen if the initialization threads are still
                 // running (and we've been configured to not wait till all
                 // 'initial' applications are put to the pool on #init())
-                while (true) { // thus we'll wait for another pool put ...
+                do { // thus we'll wait for another pool put ...
                     waitForApplication();
-                    if ( ! applicationPool.isEmpty() ) break;
-                }
+                } while (applicationPool.isEmpty());
                 app = applicationPool.remove();
             }
         }
@@ -197,7 +196,7 @@ else if ( permit && ( initialSize != null &&
     protected boolean acquireApplicationPermit() throws AcquireTimeoutException {
         // NOTE: permits are only used if a pool maximum is specified !
         if (permits != null) {
-            boolean acquired = false;
+            boolean acquired;
             try {
                 final long timeout = (long) (acquireTimeout * 1000);
                 acquired = permits.tryAcquire(timeout, TimeUnit.MILLISECONDS);
@@ -328,7 +327,7 @@ private boolean initAndPutApplicationToPool(final RackApplication app) {
     }
 
     protected Queue<RackApplication> createApplications() throws RackInitializationException {
-        Queue<RackApplication> apps = new LinkedList<RackApplication>();
+        Queue<RackApplication> apps = new LinkedList<>();
         for (int i = 0; i < initialSize; i++) {
             apps.add( createApplication(false) );
         }
@@ -376,7 +375,6 @@ private void waitForApplication() {
                 applicationPool.wait(5 * 1000);
             }
             catch (InterruptedException ignore) {
-                return;
             }
         }
     }
diff --git a/src/main/java/org/jruby/rack/RackEnvironment.java b/src/main/java/org/jruby/rack/RackEnvironment.java
@@ -7,7 +7,6 @@
 
 package org.jruby.rack;
 
-import org.jruby.rack.ext.Input;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Enumeration;
diff --git a/src/main/java/org/jruby/rack/RackException.java b/src/main/java/org/jruby/rack/RackException.java
@@ -53,7 +53,7 @@ static String exceptionMessage(final RaiseException e) {
             st.append(e.getException().toString()).append('\n');
             ByteArrayOutputStream b = new ByteArrayOutputStream();
             e.getException().printBacktrace(new PrintStream(b));
-            st.append(b.toString());
+            st.append(b);
             return st.toString();
         }
         return null;
diff --git a/src/main/java/org/jruby/rack/SerialPoolingRackApplicationFactory.java b/src/main/java/org/jruby/rack/SerialPoolingRackApplicationFactory.java
@@ -40,7 +40,7 @@ protected void launchInitialization(final Queue<RackApplication> apps) {
 
     @Override
     protected void waitTillPoolReady() {
-        return; // waiting makes no sense here as we're initializing serialy
+        // waiting makes no sense here as we're initializing serialy
     }
 
 }
diff --git a/src/main/java/org/jruby/rack/SharedRackApplicationFactory.java b/src/main/java/org/jruby/rack/SharedRackApplicationFactory.java
@@ -23,7 +23,7 @@
  */
 public class SharedRackApplicationFactory extends RackApplicationFactoryDecorator {
 
-    private RackApplication application;
+    private volatile RackApplication application;
 
     public SharedRackApplicationFactory(RackApplicationFactory delegate) {
         super(delegate);
diff --git a/src/main/java/org/jruby/rack/UnmappedRackFilter.java b/src/main/java/org/jruby/rack/UnmappedRackFilter.java
@@ -42,18 +42,12 @@ public class UnmappedRackFilter extends AbstractFilter {
 
     private boolean responseHandledByDefault = true;
 
-    private static final Collection<Integer> RESPONSE_NOT_HANDLED_STATUSES;
-    static {
-        final Set<Integer> statuses = new HashSet<>(8, 1);
-        statuses.add( 404 );
-        // 403 due containers not supporting PUT/DELETE correctly (Tomcat 6)
-        statuses.add( 403 );
-        // 405 returned by Jetty 7/8 on PUT/DELETE requests by default
-        statuses.add( 405 );
-        // 501 is returned for non standard http verbs like PATCH
-        statuses.add( 501 );
-        RESPONSE_NOT_HANDLED_STATUSES = Collections.unmodifiableSet(statuses);
-    }
+    private static final Collection<Integer> RESPONSE_NOT_HANDLED_STATUSES = Set.of(
+            404,
+            403, // 403 due to containers not supporting PUT/DELETE correctly (Tomcat 6)
+            405, // 405 returned by Jetty 7/8 on PUT/DELETE requests by default
+            501  // 501 is returned for non standard http verbs like PATCH
+    );
 
     private Collection<Integer> responseNotHandledStatuses = RESPONSE_NOT_HANDLED_STATUSES;
     private RackContext context;
@@ -91,7 +85,7 @@ public void init(FilterConfig config) throws ServletException {
                     map(String::trim)
                     .filter(status -> !status.isEmpty())
                     .map(Integer::parseInt)
-                    .collect(Collectors.toSet());
+                    .collect(Collectors.toUnmodifiableSet());
         }
         // ResponseCapture.handledByDefault true/false (true by default)
         value = config.getInitParameter("responseHandledByDefault");
diff --git a/src/main/java/org/jruby/rack/embed/Filter.java b/src/main/java/org/jruby/rack/embed/Filter.java
@@ -7,9 +7,6 @@
  */
 package org.jruby.rack.embed;
 
-import jakarta.servlet.FilterConfig;
-import jakarta.servlet.ServletException;
-
 import org.jruby.rack.AbstractFilter;
 import org.jruby.rack.RackContext;
 import org.jruby.rack.RackDispatcher;
@@ -39,10 +36,4 @@ protected RackContext getContext() {
     protected RackDispatcher getDispatcher() {
         return this.dispatcher;
     }
-
-    @Override
-    public void init(FilterConfig config) throws ServletException {
-        // NOOP
-    }
-
 }
diff --git a/src/main/java/org/jruby/rack/ext/Logger.java b/src/main/java/org/jruby/rack/ext/Logger.java
@@ -219,12 +219,8 @@ public IRubyObject get_formatter(final ThreadContext context) {
     public IRubyObject set_formatter(final ThreadContext context, final IRubyObject formatter) {
         if ( logger instanceof RackLogger.Base ) {
             final RackLogger.Base logger = (RackLogger.Base) this.logger;
-            if ( formatter.isNil() ) {
-                logger.setFormatting(true);
-            }
-            else { // if formatter set disable 'potential' logger formatting
-                logger.setFormatting(false);
-            }
+            // if formatter set disable 'potential' logger formatting
+            logger.setFormatting(formatter.isNil());
         }
         return this.formatter = formatter;
     }
@@ -455,6 +451,7 @@ private static ByteList formatSeverity(final int severity) {
         return FORMATTED_ANY;
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public <T> T toJava(Class<T> target) {
         // NOTE: maybe this is not a good idea ?!
diff --git a/src/main/java/org/jruby/rack/ext/Response.java b/src/main/java/org/jruby/rack/ext/Response.java
@@ -690,9 +690,10 @@ static IRubyObject invoke(
     }
 
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Object toJava(Class target) {
-        if ( target == null || target == RackResponse.class ) return this;
+    public <T> T toJava(Class<T> target) {
+        if ( target == null || target == RackResponse.class ) return (T) this;
         return super.toJava(target);
     }
 
diff --git a/src/main/java/org/jruby/rack/servlet/RequestCapture.java b/src/main/java/org/jruby/rack/servlet/RequestCapture.java
@@ -21,15 +21,12 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletRequestWrapper;
 
-import org.jruby.rack.RackConfig;
-
 /**
  * Request wrapper passed to filter chain.
  */
-@SuppressWarnings("rawtypes")
 public class RequestCapture extends HttpServletRequestWrapper {
 
-    private Map<String,String[]> requestParams;
+    private Map<String, String[]> requestParams;
     private RewindableInputStream inputStream;
 
     /**
@@ -39,16 +36,6 @@ public class RequestCapture extends HttpServletRequestWrapper {
     public RequestCapture(HttpServletRequest request) {
         super(request);
     }
-    
-    /**
-     * @deprecated use {@link #RequestCapture(HttpServletRequest)}
-     * @param request the request
-     * @param config will be ignored
-     */
-    @Deprecated
-    public RequestCapture(HttpServletRequest request, RackConfig config) {
-        this(request);
-    }
 
     @Override 
     public BufferedReader getReader() throws IOException {
@@ -81,7 +68,7 @@ public String getParameter(String name) {
     }
 
     @Override
-    public Map getParameterMap() {
+    public Map<String, String[]> getParameterMap() {
         if ( requestParametersParsed() ) {
             return requestParams;
         } else {
@@ -90,15 +77,15 @@ public Map getParameterMap() {
     }
 
     @Override
-    public Enumeration getParameterNames() {
+    public Enumeration<String> getParameterNames() {
         if ( requestParametersParsed() ) {
-            return new Enumeration() {
-                Iterator keys = requestParams.keySet().iterator();
+            return new Enumeration<>() {
+                final Iterator<String> keys = requestParams.keySet().iterator();
                 public boolean hasMoreElements() {
                     return keys.hasNext();
                 }
 
-                public Object nextElement() {
+                public String nextElement() {
                     return keys.next();
                 }
             };
diff --git a/src/main/java/org/jruby/rack/servlet/ResponseCapture.java b/src/main/java/org/jruby/rack/servlet/ResponseCapture.java
@@ -10,13 +10,8 @@
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
 
 import jakarta.servlet.ServletOutputStream;
 import jakarta.servlet.WriteListener;
diff --git a/src/main/java/org/jruby/rack/util/IOHelpers.java b/src/main/java/org/jruby/rack/util/IOHelpers.java
@@ -24,19 +24,14 @@
 package org.jruby.rack.util;
 
 import java.io.BufferedReader;
-import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.StringReader;
-import java.net.URL;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.jruby.Ruby;
-import org.jruby.util.ByteList;
-
 /**
  * Input - Output (stream) helpers.
  *
@@ -52,10 +47,9 @@ public static String inputStreamToString(final InputStream stream)
         String coding = "UTF-8";
         int c = stream.read();
         if ( c == '#' ) { // look for a coding: pragma
-            str.append((char) c);
-            while ( (c = stream.read()) != -1 && c != 10 ) {
+            do {
                 str.append((char) c);
-            }
+            } while ((c = stream.read()) != -1 && c != 10);
             Pattern pattern = Pattern.compile("coding:\\s*(\\S+)");
             Matcher matcher = pattern.matcher(str.toString());
             if (matcher.find()) {
@@ -73,24 +67,6 @@ public static String inputStreamToString(final InputStream stream)
         return str.toString();
     }
 
-    public static ByteList readURL(final Ruby runtime, final URL url)
-        throws IOException {
-        if ( url == null ) return null;
-
-        final int chunk = 256;
-
-        final InputStream stream = url.openStream();
-        final ByteList bytes = new ByteList(chunk);
-
-        try {
-            while ( true ) bytes.append(stream, chunk);
-        }
-        catch (EOFException e) { /* read whole stream */ }
-        finally { stream.close(); }
-
-        return bytes;
-    }
-
     public static String rubyMagicCommentValue(final String script, final String prefix)
         throws IOException {
         if ( script == null ) return null;
@@ -100,7 +76,7 @@ public static String rubyMagicCommentValue(final String script, final String pre
         String line, comment = null; Pattern pattern = null;
         while ( (line = reader.readLine()) != null ) {
             // we only support (magic) comments at the beginning :
-            if ( line.length() == 0 || line.charAt(0) != '#' ) break;
+            if (line.isEmpty() || line.charAt(0) != '#' ) break;
 
             if (pattern == null) {
                 pattern = Pattern.compile(prefix + "\\s*(\\S+)");
diff --git a/src/spec/ruby/rack/application_spec.rb b/src/spec/ruby/rack/application_spec.rb
@@ -51,7 +51,7 @@
   context "with filter setup (using captures)" do
 
     let(:rack_env) do
-      request_capture = org.jruby.rack.servlet.RequestCapture.new(servlet_request, rack_config)
+      request_capture = org.jruby.rack.servlet.RequestCapture.new(servlet_request)
       response_capture = org.jruby.rack.servlet.ResponseCapture.new(servlet_response)
       org.jruby.rack.servlet.ServletRackEnvironment.new(request_capture, response_capture, rack_context)
     end

Original file line number	Diff line number	Diff line change
`@@ -168,10 +168,9 @@ else if ( permit && ( initialSize != null &&`
`168`	`168`	`// could only happen if the initialization threads are still`
`169`	`169`	`// running (and we've been configured to not wait till all`
`170`	`170`	`// 'initial' applications are put to the pool on #init())`
`171`		`- while (true) { // thus we'll wait for another pool put ...`
	`171`	`+ do { // thus we'll wait for another pool put ...`
`172`	`172`	`waitForApplication();`
`173`		`- if ( ! applicationPool.isEmpty() ) break;`
`174`		`- }`
	`173`	`+ } while (applicationPool.isEmpty());`
`175`	`174`	`app = applicationPool.remove();`
`176`	`175`	`}`
`177`	`176`	`}`
`@@ -197,7 +196,7 @@ else if ( permit && ( initialSize != null &&`
`197`	`196`	`protected boolean acquireApplicationPermit() throws AcquireTimeoutException {`
`198`	`197`	`// NOTE: permits are only used if a pool maximum is specified !`
`199`	`198`	`if (permits != null) {`
`200`		`- boolean acquired = false;`
	`199`	`+ boolean acquired;`
`201`	`200`	`try {`
`202`	`201`	`final long timeout = (long) (acquireTimeout * 1000);`
`203`	`202`	`acquired = permits.tryAcquire(timeout, TimeUnit.MILLISECONDS);`
`@@ -328,7 +327,7 @@ private boolean initAndPutApplicationToPool(final RackApplication app) {`
`328`	`327`	`}`
`329`	`328`
`330`	`329`	`protected Queue<RackApplication> createApplications() throws RackInitializationException {`
`331`		`- Queue<RackApplication> apps = new LinkedList<RackApplication>();`
	`330`	`+ Queue<RackApplication> apps = new LinkedList<>();`
`332`	`331`	`for (int i = 0; i < initialSize; i++) {`
`333`	`332`	`apps.add( createApplication(false) );`
`334`	`333`	`}`
`@@ -376,7 +375,6 @@ private void waitForApplication() {`
`376`	`375`	`applicationPool.wait(5 * 1000);`
`377`	`376`	`}`
`378`	`377`	`catch (InterruptedException ignore) {`
`379`		`- return;`
`380`	`378`	`}`
`381`	`379`	`}`
`382`	`380`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ static String exceptionMessage(final RaiseException e) {`
`53`	`53`	`st.append(e.getException().toString()).append('\n');`
`54`	`54`	`ByteArrayOutputStream b = new ByteArrayOutputStream();`
`55`	`55`	`e.getException().printBacktrace(new PrintStream(b));`
`56`		`- st.append(b.toString());`
	`56`	`+ st.append(b);`
`57`	`57`	`return st.toString();`
`58`	`58`	`}`
`59`	`59`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ protected void launchInitialization(final Queue<RackApplication> apps) {`
`40`	`40`
`41`	`41`	`@Override`
`42`	`42`	`protected void waitTillPoolReady() {`
`43`		`- return; // waiting makes no sense here as we're initializing serialy`
	`43`	`+ // waiting makes no sense here as we're initializing serialy`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`}`