This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch ScopedContext-replace-with-interface in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit c3fafacae199cf6b167be3d4e4c1892dca17cd3e Author: Ralph Goers <[email protected]> AuthorDate: Fri Mar 29 08:09:08 2024 -0700 Use ExtendedLoggerWrapper --- .../org/apache/logging/log4j/ResourceLogger.java | 149 +-------------------- 1 file changed, 3 insertions(+), 146 deletions(-) diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/ResourceLogger.java b/log4j-api/src/main/java/org/apache/logging/log4j/ResourceLogger.java index 6df94e9334..17320a74af 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/ResourceLogger.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/ResourceLogger.java @@ -21,8 +21,8 @@ import java.util.Map; import java.util.function.Supplier; import org.apache.logging.log4j.message.Message; import org.apache.logging.log4j.message.MessageFactory; -import org.apache.logging.log4j.spi.AbstractLogger; import org.apache.logging.log4j.spi.ExtendedLogger; +import org.apache.logging.log4j.spi.ExtendedLoggerWrapper; import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.util.StackLocatorUtil; import org.apache.logging.log4j.util.Strings; @@ -37,9 +37,8 @@ import org.apache.logging.log4j.util.Strings; * Unlike regular Loggers ResourceLoggers CANNOT be declared to be static. A ResourceLogger * must be declared as a class member that will be garbage collected along with the instance of the resource. */ -public final class ResourceLogger extends AbstractLogger { +public final class ResourceLogger extends ExtendedLoggerWrapper { private static final long serialVersionUID = -5837924138744974513L; - private final ExtendedLogger logger; private final Supplier<Map<String, ?>> supplier; public static ResourceLoggerBuilder newBuilder() { @@ -52,152 +51,10 @@ public final class ResourceLogger extends AbstractLogger { */ private ResourceLogger( final ExtendedLogger logger, final Supplier<Map<String, ?>> supplier, MessageFactory messageFactory) { - super(logger.getName(), messageFactory); - this.logger = logger; + super(logger, logger.getName(), messageFactory); this.supplier = supplier; } - @Override - public Level getLevel() { - return logger.getLevel(); - } - - @Override - public boolean isEnabled(Level level, Marker marker, Message message, Throwable t) { - return logger.isEnabled(level, marker, message, t); - } - - @Override - public boolean isEnabled(Level level, Marker marker, CharSequence message, Throwable t) { - return logger.isEnabled(level, marker, message, t); - } - - @Override - public boolean isEnabled(Level level, Marker marker, Object message, Throwable t) { - return logger.isEnabled(level, marker, message, t); - } - - @Override - public boolean isEnabled(Level level, Marker marker, String message, Throwable t) { - return logger.isEnabled(level, marker, message, t); - } - - @Override - public boolean isEnabled(Level level, Marker marker, String message) { - return logger.isEnabled(level, marker, message); - } - - @Override - public boolean isEnabled(Level level, Marker marker, String message, Object... params) { - return logger.isEnabled(level, marker, message, params); - } - - @Override - public boolean isEnabled(Level level, Marker marker, String message, Object p0) { - return logger.isEnabled(level, marker, message, p0); - } - - @Override - public boolean isEnabled(Level level, Marker marker, String message, Object p0, Object p1) { - return logger.isEnabled(level, marker, message, p0, p1); - } - - @Override - public boolean isEnabled(Level level, Marker marker, String message, Object p0, Object p1, Object p2) { - return logger.isEnabled(level, marker, message, p0, p1, p2); - } - - @Override - public boolean isEnabled(Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3) { - return logger.isEnabled(level, marker, message, p0, p1, p2, p3); - } - - @Override - public boolean isEnabled( - Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4) { - return logger.isEnabled(level, marker, message, p0, p1, p2, p3, p4); - } - - @Override - public boolean isEnabled( - Level level, - Marker marker, - String message, - Object p0, - Object p1, - Object p2, - Object p3, - Object p4, - Object p5) { - return logger.isEnabled(level, marker, message, p0, p1, p2, p3, p4, p5); - } - - @Override - public boolean isEnabled( - Level level, - Marker marker, - String message, - Object p0, - Object p1, - Object p2, - Object p3, - Object p4, - Object p5, - Object p6) { - return logger.isEnabled(level, marker, message, p0, p1, p2, p3, p4, p5, p6); - } - - @Override - public boolean isEnabled( - Level level, - Marker marker, - String message, - Object p0, - Object p1, - Object p2, - Object p3, - Object p4, - Object p5, - Object p6, - Object p7) { - return logger.isEnabled(level, marker, message, p0, p1, p2, p3, p4, p5, p6, p7); - } - - @Override - public boolean isEnabled( - Level level, - Marker marker, - String message, - Object p0, - Object p1, - Object p2, - Object p3, - Object p4, - Object p5, - Object p6, - Object p7, - Object p8) { - return logger.isEnabled(level, marker, message, p0, p1, p2, p3, p4, p5, p6, p7, p8); - } - - @Override - public boolean isEnabled( - Level level, - Marker marker, - String message, - Object p0, - Object p1, - Object p2, - Object p3, - Object p4, - Object p5, - Object p6, - Object p7, - Object p8, - Object p9) { - return logger.isEnabled(level, marker, message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9); - } - @Override public void logMessage(String fqcn, Level level, Marker marker, Message message, Throwable t) { if (supplier != null) {
