Skip to content

Uniformize API of StackLocator versions #3340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 30, 2024
Merged

Uniformize API of StackLocator versions #3340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions log4j-api-java9/src/main/java/org/apache/logging/log4j/util/StackLocator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@ public Class<?> getCallerClass(final Class<?> sentinelClass, final Predicate<Cla
.orElse(null));
}

public Class<?> getCallerClass(final String fqcn) {
return getCallerClass(fqcn, "");
}

public Class<?> getCallerClass(final String fqcn, final String pkg) {
return WALKER.walk(s -> s.dropWhile(f -> !f.getClassName().equals(fqcn))
.dropWhile(f -> f.getClassName().equals(fqcn))
Expand Down
2 changes: 1 addition & 1 deletion log4j-api-java9/src/test/java/org/apache/logging/log4j/util/java9/StackLocatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ private static class Inner {
private static void assertCallerClassViaName() {
final Class<?> expected = StackLocatorTest.class;
final StackLocator stackLocator = StackLocator.getInstance();
final Class<?> actual = stackLocator.getCallerClass(Inner.class.getName());
final Class<?> actual = stackLocator.getCallerClass(Inner.class.getName(), "");
assertSame(expected, actual);
}

Expand Down
Loading