Merge pull request #423 from chadlwilson/1.2-stable-jruby-10.1

chadlwilson · web-flow · commit 710bc210c804 · 2026-04-22T00:43:51.000+08:00
1.2: [fix] ensure compatibility with JRuby 10.1
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -19,7 +19,7 @@ jobs:
 
     strategy:
       matrix:
-        jruby_version: [ '9.3.15.0', '9.4.14.0', '10.0.5.0' ]
+        jruby_version: [ '9.3.15.0', '9.4.14.0', '10.0.5.0', '10.1.0.0' ]
         java_version: [ '8', '11', '17', '21', '25' ]
         rack_version: [ '~> 2.2.0' ]
         exclude:
@@ -29,6 +29,12 @@ jobs:
             java_version: '11' # JRuby 10 requires Java 21
           - jruby_version: '10.0.5.0'
             java_version: '17' # JRuby 10 requires Java 21
+          - jruby_version: '10.1.0.0'
+            java_version: '8'  # JRuby 10 requires Java 21
+          - jruby_version: '10.1.0.0'
+            java_version: '11' # JRuby 10 requires Java 21
+          - jruby_version: '10.1.0.0'
+            java_version: '17' # JRuby 10 requires Java 21
       fail-fast: false
 
     steps:
@@ -68,7 +74,7 @@ jobs:
           'rails72_rack22',
           'rails80_rack22',
         ]
-        jruby_version: [ '9.3.15.0', '9.4.14.0', '10.0.5.0' ]
+        jruby_version: [ '9.3.15.0', '9.4.14.0', '10.0.5.0', '10.1.0.0' ]
         java_version: [ '8', '11', '17', '21', '25' ]
         exclude:
           - jruby_version: '10.0.5.0'
@@ -77,6 +83,12 @@ jobs:
             java_version: '11' # JRuby 10 requires Java 21
           - jruby_version: '10.0.5.0'
             java_version: '17' # JRuby 10 requires Java 21
+          - jruby_version: '10.1.0.0'
+            java_version: '8'  # JRuby 10 requires Java 21
+          - jruby_version: '10.1.0.0'
+            java_version: '11' # JRuby 10 requires Java 21
+          - jruby_version: '10.1.0.0'
+            java_version: '17' # JRuby 10 requires Java 21
           - appraisal: 'rails70_rack22' # Requires Ruby 2.7 compatibility, which JRuby 9.3 does not support
             jruby_version: '9.3.15.0'
           - appraisal: 'rails71_rack22' # Requires Ruby 2.7 compatibility, which JRuby 9.3 does not support
diff --git a/Appraisals b/Appraisals
@@ -2,10 +2,10 @@ version_spec = ->(prefix, desc) { "~> #{desc.split(prefix).last.insert(1, ".")}.
 
 # rails#{MAJOR}#{MINOR} => config_obj
 {
-  "rails50" => {racks: %w[rack22], ext_gems: %w[mutex_m bigdecimal base64]},
-  "rails52" => {racks: %w[rack22], ext_gems: %w[mutex_m bigdecimal]},
-  "rails60" => {racks: %w[rack22], ext_gems: %w[mutex_m bigdecimal]},
-  "rails61" => {racks: %w[rack22], ext_gems: %w[mutex_m bigdecimal]},
+  "rails50" => {racks: %w[rack22], ext_gems: %w[mutex_m bigdecimal benchmark base64]},
+  "rails52" => {racks: %w[rack22], ext_gems: %w[mutex_m bigdecimal benchmark]},
+  "rails60" => {racks: %w[rack22], ext_gems: %w[mutex_m bigdecimal benchmark]},
+  "rails61" => {racks: %w[rack22], ext_gems: %w[mutex_m bigdecimal benchmark]},
   "rails70" => {racks: %w[rack22]},
   "rails71" => {racks: %w[rack22]},
   "rails72" => {racks: %w[rack22]},
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## 1.2.7 (UNRELEASED)
 
-- Fix compatibility with JRuby 10.0 and Rails 8.0 (#419)
+- Ensure compatibility with JRuby 10.0 and 10.1 (#419)
+- Ensure compatibility with Rails 8.0 (#419)
 - Fix ability to include and forward to JSPs under Rails (#370)
 - Update (bundled) rack to 2.2.23 (#417)
 
diff --git a/Gemfile b/Gemfile
@@ -12,5 +12,8 @@ group :development do
   gem 'appraisal', :require => nil
 end
 
-gem 'rake', '~> 13.4', :group => :test, :require => nil
-gem 'rspec', :group => :test
+group :test do
+  gem 'rake', '~> 13.4', :require => nil
+  gem 'rspec'
+  gem 'logger'
+end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -6,6 +6,7 @@ GEM
       rake
       thor (>= 0.14.0)
     diff-lcs (1.6.2)
+    logger (1.7.0)
     rack (2.2.23)
     rake (13.4.2)
     rspec (3.13.2)
@@ -34,6 +35,20 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal
+  logger
   rack (~> 2.2.23)
   rake (~> 13.4)
   rspec
+
+CHECKSUMS
+  appraisal (2.5.0) sha256=36989221be127913b0dba8d114da2001e6b2dceea7bd4951200eaba764eed3ce
+  diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962
+  logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
+  rack (2.2.23) sha256=a8fe9d7e07064770b8ec123663fded8a59ef7e2b6db5cda7173d45a5718ab69c
+  rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
+  rspec (3.13.2) sha256=206284a08ad798e61f86d7ca3e376718d52c0bc944626b2349266f239f820587
+  rspec-core (3.13.6) sha256=a8823c6411667b60a8bca135364351dda34cd55e44ff94c4be4633b37d828b2d
+  rspec-expectations (3.13.5) sha256=33a4d3a1d95060aea4c94e9f237030a8f9eae5615e9bd85718fe3a09e4b58836
+  rspec-mocks (3.13.8) sha256=086ad3d3d17533f4237643de0b5c42f04b66348c28bf6b9c2d3f4a3b01af1d47
+  rspec-support (3.13.7) sha256=0640e5570872aafefd79867901deeeeb40b0c9875a36b983d85f54fb7381c47c
+  thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ For more information on Rack, visit http://rack.github.io/.
 
 | JRuby-Rack Series                                              | Status        | Rack      | JRuby      | Java | Rails     | Target Servlet API | Notes                                                          |
 |----------------------------------------------------------------|---------------|-----------|------------|------|-----------|--------------------|----------------------------------------------------------------|
-| [**1.2**](https://github.com/jruby/jruby-rack/tree/1.2-stable) | Maintained    | 2.2       | 9.3 → 10.0 | 8+   | 5.0 → 8.0 | 3.0 (Java EE 6)    | ✅ _Unofficial_: Servlet 3.1 → 4.0 also OK with most containers |
+| [**1.2**](https://github.com/jruby/jruby-rack/tree/1.2-stable) | Maintained    | 2.2       | 9.3 → 10.1 | 8+   | 5.0 → 8.0 | 3.0 (Java EE 6)    | ✅ _Unofficial_: Servlet 3.1 → 4.0 also OK with most containers |
 | [**1.1**](https://github.com/jruby/jruby-rack/tree/1.1-stable) | EOL @ 2024-05 | 1.x → 2.2 | 1.6 → 9.4  | 6+   | 2.1 → 5.2 | 2.5 (Java EE 5)    | ✅ _Unofficial_: Servlet 3.0 → 4.0 also OK with most containers |
 | [**1.0**](https://github.com/jruby/jruby-rack/tree/1.0.10)     | EOL @ 2011-11 | 0.9 → 1.x | 1.1 → 1.9  | 5+   | 2.1 → 3.x | 2.5 (Java EE 5)    |                                                                |
 
diff --git a/gemfiles/rails50_rack22.gemfile b/gemfiles/rails50_rack22.gemfile
@@ -2,17 +2,21 @@
 
 source "https://rubygems.org"
 
-gem "rake", "~> 13.4", group: :test, require: nil
-gem "rspec", group: :test
-
 group :default do
   gem "rack", "~> 2.2.0"
   gem "rails", "~> 5.0.0"
   gem "mutex_m"
   gem "bigdecimal"
+  gem "benchmark"
   gem "base64"
 end
 
 group :development do
   gem "appraisal", require: nil
 end
+
+group :test do
+  gem "rake", "~> 13.4", require: nil
+  gem "rspec"
+  gem "logger"
+end
diff --git a/gemfiles/rails52_rack22.gemfile b/gemfiles/rails52_rack22.gemfile
@@ -2,16 +2,20 @@
 
 source "https://rubygems.org"
 
-gem "rake", "~> 13.4", group: :test, require: nil
-gem "rspec", group: :test
-
 group :default do
   gem "rack", "~> 2.2.0"
   gem "rails", "~> 5.2.0"
   gem "mutex_m"
   gem "bigdecimal"
+  gem "benchmark"
 end
 
 group :development do
   gem "appraisal", require: nil
 end
+
+group :test do
+  gem "rake", "~> 13.4", require: nil
+  gem "rspec"
+  gem "logger"
+end
diff --git a/gemfiles/rails60_rack22.gemfile b/gemfiles/rails60_rack22.gemfile
@@ -2,16 +2,20 @@
 
 source "https://rubygems.org"
 
-gem "rake", "~> 13.4", group: :test, require: nil
-gem "rspec", group: :test
-
 group :default do
   gem "rack", "~> 2.2.0"
   gem "rails", "~> 6.0.0"
   gem "mutex_m"
   gem "bigdecimal"
+  gem "benchmark"
 end
 
 group :development do
   gem "appraisal", require: nil
 end
+
+group :test do
+  gem "rake", "~> 13.4", require: nil
+  gem "rspec"
+  gem "logger"
+end
diff --git a/gemfiles/rails61_rack22.gemfile b/gemfiles/rails61_rack22.gemfile
@@ -2,16 +2,20 @@
 
 source "https://rubygems.org"
 
-gem "rake", "~> 13.4", group: :test, require: nil
-gem "rspec", group: :test
-
 group :default do
   gem "rack", "~> 2.2.0"
   gem "rails", "~> 6.1.0"
   gem "mutex_m"
   gem "bigdecimal"
+  gem "benchmark"
 end
 
 group :development do
   gem "appraisal", require: nil
 end
+
+group :test do
+  gem "rake", "~> 13.4", require: nil
+  gem "rspec"
+  gem "logger"
+end
diff --git a/gemfiles/rails70_rack22.gemfile b/gemfiles/rails70_rack22.gemfile
@@ -2,9 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rake", "~> 13.4", group: :test, require: nil
-gem "rspec", group: :test
-
 group :default do
   gem "rack", "~> 2.2.0"
   gem "rails", "~> 7.0.0"
@@ -13,3 +10,9 @@ end
 group :development do
   gem "appraisal", require: nil
 end
+
+group :test do
+  gem "rake", "~> 13.4", require: nil
+  gem "rspec"
+  gem "logger"
+end
diff --git a/gemfiles/rails71_rack22.gemfile b/gemfiles/rails71_rack22.gemfile
@@ -2,9 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rake", "~> 13.4", group: :test, require: nil
-gem "rspec", group: :test
-
 group :default do
   gem "rack", "~> 2.2.0"
   gem "rails", "~> 7.1.0"
@@ -13,3 +10,9 @@ end
 group :development do
   gem "appraisal", require: nil
 end
+
+group :test do
+  gem "rake", "~> 13.4", require: nil
+  gem "rspec"
+  gem "logger"
+end
diff --git a/gemfiles/rails72_rack22.gemfile b/gemfiles/rails72_rack22.gemfile
@@ -2,9 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rake", "~> 13.4", group: :test, require: nil
-gem "rspec", group: :test
-
 group :default do
   gem "rack", "~> 2.2.0"
   gem "rails", "~> 7.2.0"
@@ -13,3 +10,9 @@ end
 group :development do
   gem "appraisal", require: nil
 end
+
+group :test do
+  gem "rake", "~> 13.4", require: nil
+  gem "rspec"
+  gem "logger"
+end
diff --git a/gemfiles/rails80_rack22.gemfile b/gemfiles/rails80_rack22.gemfile
@@ -2,9 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rake", "~> 13.4", group: :test, require: nil
-gem "rspec", group: :test
-
 group :default do
   gem "rack", "~> 2.2.0"
   gem "rails", "~> 8.0.0"
@@ -13,3 +10,9 @@ end
 group :development do
   gem "appraisal", require: nil
 end
+
+group :test do
+  gem "rake", "~> 13.4", require: nil
+  gem "rspec"
+  gem "logger"
+end
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
diff --git a/src/main/java/org/jruby/rack/DefaultRackDispatcher.java b/src/main/java/org/jruby/rack/DefaultRackDispatcher.java
diff --git a/src/main/java/org/jruby/rack/PoolingRackApplicationFactory.java b/src/main/java/org/jruby/rack/PoolingRackApplicationFactory.java
diff --git a/src/main/java/org/jruby/rack/UnmappedRackFilter.java b/src/main/java/org/jruby/rack/UnmappedRackFilter.java
diff --git a/src/main/java/org/jruby/rack/ext/Response.java b/src/main/java/org/jruby/rack/ext/Response.java
diff --git a/src/main/java/org/jruby/rack/servlet/RequestCapture.java b/src/main/java/org/jruby/rack/servlet/RequestCapture.java
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
