Remove unreleased+replaced StackLocator API from LOG4J2-2940

carterkozak · Aug 4, 2021 · 59fd1f3 · 59fd1f3
1 parent 609ff5f
commit 59fd1f3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 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
@@ -62,15 +62,10 @@ public Class<?> getCallerClass(final String fqcn) {
     }
 
     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
@@ -140,14 +140,6 @@ public Class<?> getCallerClass(final int depth) {
     // 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 Class<?> getCallerClass(final String fqcn, final String pkg, final int sk
                 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
@@ -58,25 +58,16 @@ public static Class<?> getCallerClass(final String fqcn) {
         return getCallerClass(fqcn, Strings.EMPTY);
     }
 
-    /**
-     * 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);
     }
 
     /**