This is an automated email from the ASF dual-hosted git repository. ckozak pushed a commit to branch release-2.x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 59fd1f3f62e3c503c480a933ca360112be520a74 Author: Carter Kozak <[email protected]> AuthorDate: Tue Aug 3 16:32:32 2021 -0400 Remove unreleased+replaced StackLocator API from LOG4J2-2940 --- .../java/org/apache/logging/log4j/util/StackLocator.java | 5 ----- .../java/org/apache/logging/log4j/util/StackLocator.java | 12 +----------- .../org/apache/logging/log4j/util/StackLocatorUtil.java | 13 ++----------- 3 files changed, 3 insertions(+), 27 deletions(-) diff --git a/log4j-api-java9/src/main/java/org/apache/logging/log4j/util/StackLocator.java b/log4j-api-java9/src/main/java/org/apache/logging/log4j/util/StackLocator.java index 2f78dd7..e13f78d 100644 --- a/log4j-api-java9/src/main/java/org/apache/logging/log4j/util/StackLocator.java +++ b/log4j-api-java9/src/main/java/org/apache/logging/log4j/util/StackLocator.java @@ -62,15 +62,10 @@ public class StackLocator { } public Class<?> getCallerClass(final String fqcn, final String pkg) { - return getCallerClass(fqcn, pkg, 0); - } - - public Class<?> getCallerClass(final String fqcn, final String pkg, final int skipDepth) { return walker.walk(s -> s .dropWhile(f -> !f.getClassName().equals(fqcn)) .dropWhile(f -> f.getClassName().equals(fqcn)) .dropWhile(f -> !f.getClassName().startsWith(pkg)) - .skip(skipDepth) .findFirst()) .map(StackWalker.StackFrame::getDeclaringClass) .orElse(null); diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/StackLocator.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/StackLocator.java index 5b919bb..1e50aa9 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/StackLocator.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/StackLocator.java @@ -140,14 +140,6 @@ public final class StackLocator { // migrated from Log4jLoggerFactory @PerformanceSensitive public Class<?> getCallerClass(final String fqcn, final String pkg) { - return getCallerClass(fqcn, pkg, 0); - } - - @PerformanceSensitive - public Class<?> getCallerClass(final String fqcn, final String pkg, final int skipDepth) { - if (skipDepth < 0) { - throw new IllegalArgumentException("skipDepth cannot be negative"); - } boolean next = false; Class<?> clazz; for (int i = 2; null != (clazz = getCallerClass(i)); i++) { @@ -156,9 +148,7 @@ public final class StackLocator { continue; } if (next && clazz.getName().startsWith(pkg)) { - return skipDepth == 0 - ? clazz - : getCallerClass(i + skipDepth); + return clazz; } } // TODO: return Object.class diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/StackLocatorUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/StackLocatorUtil.java index 1b98a23..72f181d 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/StackLocatorUtil.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/StackLocatorUtil.java @@ -59,24 +59,15 @@ public final class StackLocatorUtil { } /** - * Equivalent to {@link #getCallerClass(String, String, int)} with {@code skipDepth = 0}. - */ - @PerformanceSensitive - public static Class<?> getCallerClass(final String fqcn, final String pkg) { - return stackLocator.getCallerClass(fqcn, pkg); - } - - /** * Search for a calling class. * * @param fqcn Root class name whose caller to search for. * @param pkg Package name prefix that must be matched after the {@code fqcn} has been found. - * @param skipDepth Number of stack frames to skip after the {@code fqcn} and {@code pkg} have been matched. * @return The caller class that was matched, or null if one could not be located. */ @PerformanceSensitive - public static Class<?> getCallerClass(final String fqcn, final String pkg, final int skipDepth) { - return stackLocator.getCallerClass(fqcn, pkg, skipDepth); + public static Class<?> getCallerClass(final String fqcn, final String pkg) { + return stackLocator.getCallerClass(fqcn, pkg); } /**
