Remove unreleased+replaced StackLocator API from LOG4J2-2940
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 3fb936a..2a92d8f 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
@@ -63,16 +63,10 @@
@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) {
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/StackLocatorUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/StackLocatorUtil.java
index 482ee33..d27fb9c 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 @@
}
/**
- * 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);
}
/**
