Skip to content

Commit 95243be

Browse files
chadlwilsonchadlwilson
committed
[chore] Minor code inspection & style fixes for modern Java 17
1 parent 9a77f0d commit 95243be

File tree

7 files changed

+47
-58
lines changed

7 files changed

+47
-58
lines changed

‎src/main/java/org/jruby/rack/DefaultRackApplicationFactory.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,9 +190,10 @@ public IRubyObject createErrorApplicationObject(final Ruby runtime) {
190190

191191
}
192192
if (errorApp == null) {
193-
errorApp = "require 'jruby/rack/error_app' \n" +
194-
"use JRuby::Rack::ErrorApp::ShowStatus \n" +
195-
"run JRuby::Rack::ErrorApp.new";
193+
errorApp = """
194+
require 'jruby/rack/error_app'
195+
use JRuby::Rack::ErrorApp::ShowStatus
196+
run JRuby::Rack::ErrorApp.new""";
196197
}
197198
runtime.evalScriptlet("load 'jruby/rack/boot/rack.rb'");
198199
return createRackServletWrapper(runtime, errorApp, errorAppPath);

‎src/main/java/org/jruby/rack/ext/Logger.java‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -190,14 +190,14 @@ private boolean isEnabledFor(final int severity,
190190
}
191191

192192
private static RackLogger.Level mapLevel(final int level) {
193-
switch (level) {
194-
case DEBUG: return RackLogger.Level.DEBUG;
195-
case INFO : return RackLogger.Level.INFO ;
196-
case WARN : return RackLogger.Level.WARN ;
197-
case ERROR: return RackLogger.Level.ERROR;
198-
case FATAL: return RackLogger.Level.FATAL;
199-
}
200-
return null;
193+
return switch (level) {
194+
case DEBUG -> RackLogger.Level.DEBUG;
195+
case INFO -> RackLogger.Level.INFO;
196+
case WARN -> RackLogger.Level.WARN;
197+
case ERROR -> RackLogger.Level.ERROR;
198+
case FATAL -> RackLogger.Level.FATAL;
199+
default -> null;
200+
};
201201
}
202202

203203
@JRubyMethod(name = "progname")
@@ -380,8 +380,7 @@ private boolean add(final int severity, final ThreadContext context,
380380
final long datetime = System.currentTimeMillis();
381381
msg = format_message(context, severity, datetime, progname, msg);
382382
}
383-
else if ( msg instanceof RubyException ) { // print backtrace for error
384-
final RubyException error = (RubyException) msg;
383+
else if (msg instanceof RubyException error) { // print backtrace for error
385384
error.prepareIntegratedBacktrace(context, null);
386385
doLog( loggerLevel, ExceptionUtils.formatError(error) );
387386
return true;
@@ -441,14 +440,14 @@ public IRubyObject format_severity(final ThreadContext context, final IRubyObjec
441440
new ByteList(new byte[] { 'A','N','Y' }, false);
442441

443442
private static ByteList formatSeverity(final int severity) {
444-
switch ( severity) {
445-
case DEBUG: return FORMATTED_DEBUG;
446-
case INFO : return FORMATTED_INFO ;
447-
case WARN : return FORMATTED_WARN ;
448-
case ERROR: return FORMATTED_ERROR;
449-
case FATAL: return FORMATTED_FATAL;
450-
}
451-
return FORMATTED_ANY;
443+
return switch (severity) {
444+
case DEBUG -> FORMATTED_DEBUG;
445+
case INFO -> FORMATTED_INFO;
446+
case WARN -> FORMATTED_WARN;
447+
case ERROR -> FORMATTED_ERROR;
448+
case FATAL -> FORMATTED_FATAL;
449+
default -> FORMATTED_ANY;
450+
};
452451
}
453452

454453
@SuppressWarnings("unchecked")

‎src/main/java/org/jruby/rack/ext/Response.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,7 @@ protected Response(Ruby runtime, RubyClass metaClass) {
227227
*/
228228
@JRubyMethod(required = 1)
229229
public IRubyObject initialize(final ThreadContext context, final IRubyObject arg) {
230-
if ( arg instanceof RubyArray ) {
231-
final RubyArray<?> arr = (RubyArray<?>) arg;
230+
if (arg instanceof RubyArray<?> arr) {
232231
if ( arr.size() < 3 ) {
233232
throw context.runtime.newArgumentError("expected 3 array elements (rack-respose)");
234233
}

‎src/main/java/org/jruby/rack/logging/CommonsLoggingLogger.java‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,13 @@ public void setLoggerName(String loggerName) {
3535
@Override
3636
public boolean isEnabled(Level level) {
3737
if ( level == null ) return logger.isInfoEnabled(); // TODO ???!
38-
switch ( level ) {
39-
case DEBUG: return logger.isDebugEnabled();
40-
case INFO: return logger.isInfoEnabled();
41-
case WARN: return logger.isWarnEnabled();
42-
case ERROR: return logger.isErrorEnabled();
43-
case FATAL: return logger.isFatalEnabled();
44-
}
45-
return logger.isTraceEnabled();
38+
return switch (level) {
39+
case DEBUG -> logger.isDebugEnabled();
40+
case INFO -> logger.isInfoEnabled();
41+
case WARN -> logger.isWarnEnabled();
42+
case ERROR -> logger.isErrorEnabled();
43+
case FATAL -> logger.isFatalEnabled();
44+
};
4645
}
4746

4847
@Override

‎src/main/java/org/jruby/rack/logging/JulLogger.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,12 @@ public void log(Level level, CharSequence message, Throwable e) {
7676
private static java.util.logging.Level mapLevel(
7777
final Level level, java.util.logging.Level defaultLevel) {
7878
if ( level == null ) { return defaultLevel; }
79-
switch ( level ) {
80-
case DEBUG: return java.util.logging.Level.FINE;
81-
case INFO: return java.util.logging.Level.INFO;
82-
case WARN: return java.util.logging.Level.WARNING;
83-
case ERROR: return java.util.logging.Level.SEVERE;
84-
case FATAL: return java.util.logging.Level.SEVERE;
85-
}
86-
return defaultLevel;
79+
return switch (level) {
80+
case DEBUG -> java.util.logging.Level.FINE;
81+
case INFO -> java.util.logging.Level.INFO;
82+
case WARN -> java.util.logging.Level.WARNING;
83+
case ERROR, FATAL -> java.util.logging.Level.SEVERE;
84+
};
8785
}
8886

8987
@Override

‎src/main/java/org/jruby/rack/logging/Slf4jLogger.java‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,12 @@ public void setLoggerName(String loggerName) {
3939
@Override
4040
public boolean isEnabled(Level level) {
4141
if ( level == null ) return logger.isInfoEnabled(); // TODO ???!
42-
switch ( level ) {
43-
case DEBUG: return logger.isDebugEnabled();
44-
case INFO: return logger.isInfoEnabled();
45-
case WARN: return logger.isWarnEnabled();
46-
case ERROR: return logger.isErrorEnabled();
47-
case FATAL: return logger.isErrorEnabled();
48-
}
49-
return logger.isTraceEnabled();
42+
return switch (level) {
43+
case DEBUG -> logger.isDebugEnabled();
44+
case INFO -> logger.isInfoEnabled();
45+
case WARN -> logger.isWarnEnabled();
46+
case ERROR, FATAL -> logger.isErrorEnabled();
47+
};
5048
}
5149

5250
@Override
@@ -56,8 +54,7 @@ public void log(Level level, CharSequence message) {
5654
case DEBUG: logger.debug(message.toString()); break;
5755
case INFO: logger.info(message.toString()); break;
5856
case WARN: logger.warn(message.toString()); break;
59-
case ERROR: logger.error(message.toString()); break;
60-
case FATAL: logger.error(message.toString()); break;
57+
case ERROR, FATAL: logger.error(message.toString()); break;
6158
}
6259
}
6360

@@ -68,8 +65,7 @@ public void log(Level level, CharSequence message, Throwable ex) {
6865
case DEBUG: logger.debug(message.toString(), ex); break;
6966
case INFO: logger.info(message.toString(), ex); break;
7067
case WARN: logger.warn(message.toString(), ex); break;
71-
case ERROR: logger.error(message.toString(), ex); break;
72-
case FATAL: logger.error(message.toString(), ex); break;
68+
case ERROR, FATAL: logger.error(message.toString(), ex); break;
7369
}
7470
}
7571

‎src/spec/java/org/jruby/rack/fake/FakePageContext.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,15 @@
2222
import jakarta.servlet.http.HttpSession;
2323
import jakarta.servlet.jsp.JspWriter;
2424
import jakarta.servlet.jsp.PageContext;
25-
import jakarta.el.ExpressionFactory;
26-
import jakarta.el.ELResolver;
2725

2826
/**
2927
* Currently only used as a mock for testing.
3028
*/
31-
@SuppressWarnings("deprecation")
3229
public class FakePageContext extends PageContext {
33-
private ServletContext context;
34-
private ServletRequest request;
35-
private ServletResponse response;
36-
private JspWriter out;
30+
private final ServletContext context;
31+
private final ServletRequest request;
32+
private final ServletResponse response;
33+
private final JspWriter out;
3734

3835
public FakePageContext(ServletContext context, HttpServletRequest request, HttpServletResponse response, JspWriter out) {
3936
this.context = context;

0 commit comments

Comments
 (0)