Skip to content

Commit 7fa502e

Browse files
committed
[chore] Remove unnecessary deprecated RackLogger override signatures
These turn up as warnings for all usages within juby-rack itself, since most usages use a string. The interface was changed to accept a more generic type, so this is only a breaking change for sub-classes rather than consumers. Since 1.3 has other changes to the logging implementations, we may as well make this required too.
1 parent 9cf1acc commit 7fa502e

File tree

3 files changed

+1
-11
lines changed

3 files changed

+1
-11
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Breaking Java API changes
1717
- Drop deprecated `org.jruby.rack.RackInput` alias for `org.jruby.rack.ext.Input` class
1818
- Drop/rename deprecated `RackConfig` and `ServletRackEnvironment` API methods per their earlier comments
1919
- Drop deprecated `RackLogger` string (`level`) constants
20+
- Custom `RackLogger` implementations must accept `CharSequence` rather than `String` to allow `RubyString` passthrough
2021

2122
Breaking Ruby API changes
2223
- Drop deprecated `JRuby::Rack::RailsFileSystemLayout` alias for `JRuby::Rack::FileSystemLayout`

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ public void process(RackEnvironment request, RackResponseEnvironment response)
4343
}
4444
}
4545

46-
@SuppressWarnings("deprecation")
4746
protected void handleException(
4847
final Exception e,
4948
final RackEnvironment request,

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,6 @@ default void log(CharSequence message, Throwable ex) {
3030
log(Level.ERROR, message, ex);
3131
}
3232

33-
@Deprecated
34-
default void log(Level level, String message) {
35-
log(level, (CharSequence) message);
36-
}
37-
38-
@Deprecated
39-
default void log(Level level, String message, Throwable ex) {
40-
log(level, (CharSequence) message, ex);
41-
}
42-
4333
abstract class Base implements RackLogger {
4434
public abstract Level getLevel() ;
4535
public void setLevel(Level level) { /* noop */ }

0 commit comments

Comments
 (0)