Skip to content

Commit 4154dd8

Browse files
committed
Fix entry()/exit() deprecations
The `entry()/exit()` methods were deprecated in 2.6, when `o.a.l.l.Logger` was annotated with `@Deprecated`. Their `AbstractLogger` implementations became deprecated at the same time.
1 parent 17389cc commit 4154dd8

File tree

2 files changed

+1
-13
lines changed

2 files changed

+1
-13
lines changed

log4j-api/src/main/java/org/apache/logging/log4j/Logger.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,7 @@ void debug(
699699
/**
700700
* Logs entry to a method. Used when the method in question has no parameters or when the parameters should not be
701701
* logged.
702-
* @deprecated :uUse {@link #traceEntry()} instead which performs the same function.
702+
* @deprecated Since 2.6, use {@link #traceEntry()} instead which performs the same function.
703703
*/
704704
@Deprecated
705705
void entry();

log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -679,18 +679,12 @@ protected EntryMessage enter(final String fqcn, final Message message) {
679679
return flowMessage;
680680
}
681681

682-
/**
683-
* @deprecated since 2.11.0
684-
*/
685682
@Deprecated
686683
@Override
687684
public void entry() {
688685
entry(FQCN, (Object[]) null);
689686
}
690687

691-
/**
692-
* @deprecated since 2.22.0, use {@link #traceEntry(String, Object...)} instead.
693-
*/
694688
@Deprecated
695689
@Override
696690
public void entry(final Object... params) {
@@ -1095,18 +1089,12 @@ public void error(
10951089
logIfEnabled(FQCN, Level.ERROR, null, message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
10961090
}
10971091

1098-
/**
1099-
* @deprecated since 2.11.0
1100-
*/
11011092
@Deprecated
11021093
@Override
11031094
public void exit() {
11041095
exit(FQCN, (Object) null);
11051096
}
11061097

1107-
/**
1108-
* @deprecated since 2.11.0
1109-
*/
11101098
@Deprecated
11111099
@Override
11121100
public <R> R exit(final R result) {

0 commit comments

Comments
 (0)