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

Author: chadlwilson

Gemfile.lock

@@ -20,7 +20,7 @@ GEM
     rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.4)
+    rspec-support (3.13.5)
     thor (1.4.0)
 
 PLATFORMS

Rakefile

@@ -177,15 +177,15 @@ task :gem => [target_jar, target_jruby_rack, target_jruby_rack_version] do
     gemspec = Gem::Specification.new do |gem|
       gem.name = %q{jruby-rack}
       gem.version = GEM_VERSION
-      gem.authors = ['Nick Sieger']
+      gem.authors = ['Nick Sieger', 'Karol Bucek', 'JRuby contributors']
       gem.date = Date.today.to_s
       gem.license = 'MIT'
       gem.description = %{JRuby-Rack is a combined Java and Ruby library that adapts the Java Servlet API to Rack. For JRuby only.}
       gem.summary = %q{Rack adapter for JRuby and Servlet Containers}
       gem.email = ['[email protected]']
       gem.files = FileList["./**/*"].exclude("*.gem").map{ |f| f.sub(/^\.\//, '') }
       gem.homepage = %q{http://jruby.org}
-      gem.has_rdoc = false
+      gem.required_ruby_version = '>= 3.1.0' # JRuby >= 9.4
     end
     defined?(Gem::Builder) ? Gem::Builder.new(gemspec).build : begin
       require 'rubygems/package'; Gem::Package.build(gemspec)

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

@@ -47,6 +47,7 @@ public abstract class AbstractFilter implements Filter {
      * @throws IOException if there's an IO exception
      * @throws ServletException if there's a servlet exception
      */
+    @Override
     public final void doFilter(
             ServletRequest request, ServletResponse response,
             FilterChain chain) throws IOException, ServletException {

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

@@ -26,6 +26,7 @@ public AbstractRackDispatcher(RackContext context) {
         this.context = context;
     }
 
+    @Override
     public void process(RackEnvironment request, RackResponseEnvironment response)
         throws IOException {
 

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

@@ -84,6 +84,7 @@ private class Response implements RackResponse {
 
         public Response(RackEnvironment env) { this.env = env; }
 
+        @Override
         public int getStatus() {
             return status;
         }
@@ -93,6 +94,7 @@ public void setStatus(int status) {
             this.status = status;
         }
 
+        @Override
         public Map<String, ?> getHeaders() {
             return headers;
         }
@@ -102,6 +104,7 @@ public void setHeaders(Map<String, ?> headers) {
             this.headers = headers == null ? Collections.emptyMap() : headers;
         }
 
+        @Override
         public String getBody() {
             if ( body == null ) {
                 try {
@@ -135,6 +138,7 @@ protected String buildErrorBody() {
             return stringWriter.toString();
         }
 
+        @Override
         public void respond(RackResponseEnvironment response) {
             try {
                 defaultRespond(this, response);

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

@@ -59,15 +59,19 @@ public void setError(Exception error) {
         this.error = error;
     }
 
+    @Override
     public RackResponse call(final RackEnvironment env) {
         env.setAttribute(RackEnvironment.EXCEPTION, getError());
         return getErrorApplication().call(env);
     }
 
+    @Override
     public void init() { getErrorApplication().init(); }
 
+    @Override
     public void destroy() { getErrorApplication().destroy(); }
 
+    @Override
     public Ruby getRuntime() {
         return getErrorApplication().getRuntime();
     }

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

@@ -73,30 +73,37 @@ protected String resolveProperty(String key) {
         return value;
     }
 
+    @Override
     public final String getProperty(String key) {
         return delegate.getProperty(key);
     }
 
+    @Override
     public final String getProperty(String key, String defaultValue) {
         return delegate.getProperty(key, defaultValue);
     }
 
+    @Override
     public final Boolean getBooleanProperty(String key) {
         return delegate.getBooleanProperty(key);
     }
 
+    @Override
     public final Boolean getBooleanProperty(String key, Boolean defaultValue) {
         return delegate.getBooleanProperty(key, defaultValue);
     }
 
+    @Override
     public final Number getNumberProperty(String key) {
         return delegate.getNumberProperty(key);
     }
 
+    @Override
     public final Number getNumberProperty(String key, Number defaultValue) {
         return delegate.getNumberProperty(key, defaultValue);
     }
 
+    @Override
     public RackLogger getLogger() {
         if (logger == null) {
             logger = delegate.getLogger();
@@ -108,6 +115,7 @@ public void setLogger(RackLogger logger) {
         this.logger = logger;
     }
 
+    @Override
     public PrintStream getOut() {
         return delegate.getOut();
     }
@@ -116,6 +124,7 @@ public void setOut(OutputStream out) {
         delegate.setOut(out);
     }
 
+    @Override
     public PrintStream getErr() {
         return delegate.getErr();
     }
@@ -124,66 +133,81 @@ public void setErr(OutputStream err) {
         delegate.setErr(err);
     }
 
+    @Override
     public boolean isRewindable() {
         return delegate.isRewindable();
     }
 
+    @Override
     public Integer getInitialMemoryBufferSize() {
         return delegate.getInitialMemoryBufferSize();
     }
 
+    @Override
     public Integer getMaximumMemoryBufferSize() {
         return delegate.getMaximumMemoryBufferSize();
     }
 
+    @Override
     public String getRackup() {
         return delegate.getRackup();
     }
 
+    @Override
     public String getRackupPath() {
         return delegate.getRackupPath();
     }
 
     // runtime pooling in embedded ENVs not implemented :
 
+    @Override
     public Integer getRuntimeTimeoutSeconds() {
         throw new UnsupportedOperationException("getRuntimeTimeoutSeconds()");
     }
 
+    @Override
     public Integer getInitialRuntimes() {
         throw new UnsupportedOperationException("getInitialRuntimes()");
     }
 
+    @Override
     public Integer getMaximumRuntimes() {
         throw new UnsupportedOperationException("getMaximumRuntimes()");
     }
 
+    @Override
     public String[] getRuntimeArguments() {
         throw new UnsupportedOperationException("getRuntimeArguments()");
     }
 
+    @Override
     public Integer getNumInitializerThreads() {
         throw new UnsupportedOperationException("getNumInitializerThreads()");
     }
 
+    @Override
     public boolean isSerialInitialization() {
         throw new UnsupportedOperationException("isSerialInitialization()");
     }
 
+    @Override
     public boolean isIgnoreEnvironment() {
         throw new UnsupportedOperationException("isIgnoreEnvironment()");
     }
 
+    @Override
     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/ext/Response.java

@@ -270,6 +270,7 @@ public IRubyObject headers(final ThreadContext context) {
      * @return the response status
      * @see RackResponse#getStatus()
      */
+    @Override
     public int getStatus() {
         return this.status;
     }
@@ -278,6 +279,7 @@ public int getStatus() {
      * @return the headers hash
      * @see RackResponse#getHeaders()
      */
+    @Override
     @SuppressWarnings("unchecked")
     public Map<String, ?> getHeaders() {
         return this.headers;
@@ -287,6 +289,7 @@ public int getStatus() {
      * @return the response body (build up as a string)
      * @see RackResponse#getBody()
      */
+    @Override
     public String getBody() {
         if ( this.body instanceof RubyString ) return this.body.asJavaString();
         // body = ""; @body.each { |part| body << part }; body
@@ -320,6 +323,7 @@ public IRubyObject yield(ThreadContext context, IRubyObject part) {
      * Respond this response with the given (servlet) response environment.
      * @see RackResponse#respond(RackResponseEnvironment)
      */
+    @Override
     public void respond(final RackResponseEnvironment response) throws RackException {
         if ( ! response.isCommitted() ) {
             try { // NOTE: we're assuming possible overrides are out of our NS

src/main/java/org/jruby/rack/servlet/RequestCapture.java

@@ -81,10 +81,12 @@ public Enumeration<String> getParameterNames() {
         if ( requestParametersParsed() ) {
             return new Enumeration<String>() {
                 final Iterator<String> keys = requestParams.keySet().iterator();
+                @Override
                 public boolean hasMoreElements() {
                     return keys.hasNext();
                 }
 
+                @Override
                 public String nextElement() {
                     return keys.next();
                 }

src/main/java/org/jruby/rack/servlet/ResponseCapture.java

@@ -47,6 +47,7 @@ public ResponseCapture(HttpServletResponse response) {
      * @return the status set using one of the set status methods
      * @see #handleStatus(int, boolean)
      */
+    @Override
     public int getStatus() {
         return status != null ? status : 200;
     }