[chore] Minor code inspection & style fixes for modern Java 17

jruby · bhagyashriSawkar · Oct 24, 2024 · Oct 24, 2024 · Oct 24, 2024 · Feb 19, 2025
commit 95243be3e55f27885f72034606dc61c8610e7e61
diff --git a/src/main/java/org/jruby/rack/DefaultRackApplicationFactory.java b/src/main/java/org/jruby/rack/DefaultRackApplicationFactory.java
@@ -190,9 +190,10 @@ public IRubyObject createErrorApplicationObject(final Ruby runtime) {
 
         }
         if (errorApp == null) {
-            errorApp = "require 'jruby/rack/error_app' \n" +
-            "use JRuby::Rack::ErrorApp::ShowStatus \n" +
-            "run JRuby::Rack::ErrorApp.new";
+            errorApp = """
+                    require 'jruby/rack/error_app'
+                    use JRuby::Rack::ErrorApp::ShowStatus
+                    run JRuby::Rack::ErrorApp.new""";
         }
         runtime.evalScriptlet("load 'jruby/rack/boot/rack.rb'");
         return createRackServletWrapper(runtime, errorApp, errorAppPath);

diff --git a/src/main/java/org/jruby/rack/ext/Logger.java b/src/main/java/org/jruby/rack/ext/Logger.java
@@ -190,14 +190,14 @@ private boolean isEnabledFor(final int severity,
     }
 
     private static RackLogger.Level mapLevel(final int level) {
-        switch (level) {
-            case DEBUG: return RackLogger.Level.DEBUG;
-            case INFO : return RackLogger.Level.INFO ;
-            case WARN : return RackLogger.Level.WARN ;
-            case ERROR: return RackLogger.Level.ERROR;
-            case FATAL: return RackLogger.Level.FATAL;
-        }
-        return null;
+        return switch (level) {
+            case DEBUG -> RackLogger.Level.DEBUG;
+            case INFO -> RackLogger.Level.INFO;
+            case WARN -> RackLogger.Level.WARN;
+            case ERROR -> RackLogger.Level.ERROR;
+            case FATAL -> RackLogger.Level.FATAL;
+            default -> null;
+        };
     }
 
     @JRubyMethod(name = "progname")
@@ -380,8 +380,7 @@ private boolean add(final int severity, final ThreadContext context,
             final long datetime = System.currentTimeMillis();
             msg = format_message(context, severity, datetime, progname, msg);
         }
-        else if ( msg instanceof RubyException ) { // print backtrace for error
-            final RubyException error = (RubyException) msg;
+        else if (msg instanceof RubyException error) { // print backtrace for error
             error.prepareIntegratedBacktrace(context, null);
             doLog( loggerLevel, ExceptionUtils.formatError(error) );
             return true;
@@ -441,14 +440,14 @@ public IRubyObject format_severity(final ThreadContext context, final IRubyObjec
             new ByteList(new byte[] { 'A','N','Y' }, false);
 
     private static ByteList formatSeverity(final int severity) {
-        switch ( severity) {
-            case DEBUG: return FORMATTED_DEBUG;
-            case INFO : return FORMATTED_INFO ;
-            case WARN : return FORMATTED_WARN ;
-            case ERROR: return FORMATTED_ERROR;
-            case FATAL: return FORMATTED_FATAL;
-        }
-        return FORMATTED_ANY;
+        return switch (severity) {
+            case DEBUG -> FORMATTED_DEBUG;
+            case INFO -> FORMATTED_INFO;
+            case WARN -> FORMATTED_WARN;
+            case ERROR -> FORMATTED_ERROR;
+            case FATAL -> FORMATTED_FATAL;
+            default -> FORMATTED_ANY;
+        };
     }
 
     @SuppressWarnings("unchecked")

diff --git a/src/main/java/org/jruby/rack/ext/Response.java b/src/main/java/org/jruby/rack/ext/Response.java
@@ -227,8 +227,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;
+        if (arg instanceof RubyArray<?> arr) {
             if ( arr.size() < 3 ) {
                 throw context.runtime.newArgumentError("expected 3 array elements (rack-respose)");
             }

diff --git a/src/main/java/org/jruby/rack/logging/CommonsLoggingLogger.java b/src/main/java/org/jruby/rack/logging/CommonsLoggingLogger.java
@@ -35,14 +35,13 @@ public void setLoggerName(String loggerName) {
     @Override
     public boolean isEnabled(Level level) {
         if ( level == null ) return logger.isInfoEnabled(); // TODO ???!
-        switch ( level ) {
-            case DEBUG: return logger.isDebugEnabled();
-            case INFO:  return logger.isInfoEnabled();
-            case WARN:  return logger.isWarnEnabled();
-            case ERROR: return logger.isErrorEnabled();
-            case FATAL: return logger.isFatalEnabled();
-        }
-        return logger.isTraceEnabled();
+        return switch (level) {
+            case DEBUG -> logger.isDebugEnabled();
+            case INFO -> logger.isInfoEnabled();
+            case WARN -> logger.isWarnEnabled();
+            case ERROR -> logger.isErrorEnabled();
+            case FATAL -> logger.isFatalEnabled();
+        };
     }
 
     @Override

diff --git a/src/main/java/org/jruby/rack/logging/JulLogger.java b/src/main/java/org/jruby/rack/logging/JulLogger.java
@@ -76,14 +76,12 @@ public void log(Level level, CharSequence message, Throwable e) {
     private static java.util.logging.Level mapLevel(
         final Level level, java.util.logging.Level defaultLevel) {
         if ( level == null ) { return defaultLevel; }
-        switch ( level ) {
-            case DEBUG: return java.util.logging.Level.FINE;
-            case INFO:  return java.util.logging.Level.INFO;
-            case WARN:  return java.util.logging.Level.WARNING;
-            case ERROR: return java.util.logging.Level.SEVERE;
-            case FATAL: return java.util.logging.Level.SEVERE;
-        }
-        return defaultLevel;
+        return switch (level) {
+            case DEBUG -> java.util.logging.Level.FINE;
+            case INFO -> java.util.logging.Level.INFO;
+            case WARN -> java.util.logging.Level.WARNING;
+            case ERROR, FATAL -> java.util.logging.Level.SEVERE;
+        };
     }
 
     @Override

diff --git a/src/main/java/org/jruby/rack/logging/Slf4jLogger.java b/src/main/java/org/jruby/rack/logging/Slf4jLogger.java
@@ -39,14 +39,12 @@ public void setLoggerName(String loggerName) {
     @Override
     public boolean isEnabled(Level level) {
         if ( level == null ) return logger.isInfoEnabled(); // TODO ???!
-        switch ( level ) {
-            case DEBUG: return logger.isDebugEnabled();
-            case INFO:  return logger.isInfoEnabled();
-            case WARN:  return logger.isWarnEnabled();
-            case ERROR: return logger.isErrorEnabled();
-            case FATAL: return logger.isErrorEnabled();
-        }
-        return logger.isTraceEnabled();
+        return switch (level) {
+            case DEBUG -> logger.isDebugEnabled();
+            case INFO -> logger.isInfoEnabled();
+            case WARN -> logger.isWarnEnabled();
+            case ERROR, FATAL -> logger.isErrorEnabled();
+        };
     }
 
     @Override
@@ -56,8 +54,7 @@ public void log(Level level, CharSequence message) {
             case DEBUG: logger.debug(message.toString()); break;
             case INFO:  logger.info(message.toString()); break;
             case WARN:  logger.warn(message.toString()); break;
-            case ERROR: logger.error(message.toString()); break;
-            case FATAL: logger.error(message.toString()); break;
+            case ERROR, FATAL: logger.error(message.toString()); break;
         }
     }
 
@@ -68,8 +65,7 @@ public void log(Level level, CharSequence message, Throwable ex) {
             case DEBUG: logger.debug(message.toString(), ex); break;
             case INFO:  logger.info(message.toString(), ex); break;
             case WARN:  logger.warn(message.toString(), ex); break;
-            case ERROR: logger.error(message.toString(), ex); break;
-            case FATAL: logger.error(message.toString(), ex); break;
+            case ERROR, FATAL: logger.error(message.toString(), ex); break;
         }
     }
 

diff --git a/src/spec/java/org/jruby/rack/fake/FakePageContext.java b/src/spec/java/org/jruby/rack/fake/FakePageContext.java
@@ -22,18 +22,15 @@
 import jakarta.servlet.http.HttpSession;
 import jakarta.servlet.jsp.JspWriter;
 import jakarta.servlet.jsp.PageContext;
-import jakarta.el.ExpressionFactory;
-import jakarta.el.ELResolver;
 
 /**
  * Currently only used as a mock for testing.
  */
-@SuppressWarnings("deprecation")
 public class FakePageContext extends PageContext {
-    private ServletContext context;
-    private ServletRequest request;
-    private ServletResponse response;
-    private JspWriter out;
+    private final ServletContext context;
+    private final ServletRequest request;
+    private final ServletResponse response;
+    private final JspWriter out;
 
     public FakePageContext(ServletContext context, HttpServletRequest request, HttpServletResponse response, JspWriter out) {
         this.context = context;