fix SLF4J-511

slf4j-api/src/main/java/org/slf4j/event/LoggingEventAware.java

@@ -1,13 +0,0 @@
-package org.slf4j.event;
-
-/**
- * 
- * 
- * @author Ceki Gülcü
- * @since 2.0.0
- */
-public interface LoggingEventAware {
-
-  void log(LoggingEvent event);
-	
-}

slf4j-api/src/main/java/org/slf4j/spi/DefaultLoggingEventBuilder.java

@@ -8,7 +8,6 @@ import org.slf4j.event.DefaultLoggingEvent;
 import org.slf4j.event.KeyValuePair;
 import org.slf4j.event.Level;
 import org.slf4j.event.LoggingEvent;
-import org.slf4j.event.LoggingEventAware;
 
 public class DefaultLoggingEventBuilder implements LoggingEventBuilder {
 

slf4j-api/src/main/java/org/slf4j/spi/LoggingEventAware.java

@@ -2,8 +2,12 @@ package org.slf4j.spi;
 
 import org.slf4j.event.LoggingEvent;
 
+/**
+ * A logger capable of logging from org.slf4j.event.LoggingEvent implements this interface.
+ * 
+ * @author Ceki Gulcu
+ * @since 2.0.0
+ */
 public interface LoggingEventAware {
-
 	void log(LoggingEvent event);
-	
 }

slf4j-log4j12/src/main/java/org/slf4j/log4j12/Log4jLoggerAdapter.java

@@ -33,12 +33,17 @@ import org.apache.log4j.spi.LocationInfo;
 import org.apache.log4j.spi.ThrowableInformation;
 import org.slf4j.Logger;
 import org.slf4j.Marker;
+import org.slf4j.event.DefaultLoggingEvent;
 import org.slf4j.event.LoggingEvent;
+import org.slf4j.event.SubstituteLoggingEvent;
 import org.slf4j.helpers.LegacyAbstractLogger;
 import org.slf4j.helpers.MessageFormatter;
 import org.slf4j.helpers.NormalizedParameters;
 import org.slf4j.helpers.SubstituteLogger;
+import org.slf4j.spi.DefaultLoggingEventBuilder;
 import org.slf4j.spi.LocationAwareLogger;
+import org.slf4j.spi.LoggingEventAware;
+import org.slf4j.spi.LoggingEventBuilder;
 
 /**
  * A wrapper over {@link org.apache.log4j.Logger org.apache.log4j.Logger} in
@@ -46,122 +51,124 @@ import org.slf4j.spi.LocationAwareLogger;
  * 
  * <p>
  * Note that the logging levels mentioned in this class refer to those defined
- * in the <a
+ * in the <a href=
- * href="http://logging.apache.org/log4j/docs/api/org/apache/log4j/Level.html">
+ * "http://logging.apache.org/log4j/docs/api/org/apache/log4j/Level.html">
  * <code>org.apache.log4j.Level</code></a> class.
  * 
  * <p>
  * The TRACE level was introduced in log4j version 1.2.12. In order to avoid
  * crashing the host application, in the case the log4j version in use predates
- * 1.2.12, the TRACE level will be mapped as DEBUG. See also <a
+ * 1.2.12, the TRACE level will be mapped as DEBUG. See also
- * href="http://jira.qos.ch/browse/SLF4J-59">SLF4J-59</a>.
+ * <a href="http://jira.qos.ch/browse/SLF4J-59">SLF4J-59</a>.
  * 
  * @author Ceki G&uuml;lc&uuml;
  */
-public final class Log4jLoggerAdapter extends LegacyAbstractLogger implements LocationAwareLogger, Serializable {
+public final class Log4jLoggerAdapter extends LegacyAbstractLogger
+		implements LocationAwareLogger, LoggingEventAware, Serializable {
 
-    private static final long serialVersionUID = 6182834493563598289L;
+	private static final long serialVersionUID = 6182834493563598289L;
 
-    final transient org.apache.log4j.Logger logger;
+	final transient org.apache.log4j.Logger logger;
 
-    /**
+	/**
-     * Following the pattern discussed in pages 162 through 168 of "The complete
+	 * Following the pattern discussed in pages 162 through 168 of "The complete
-     * log4j manual".
+	 * log4j manual".
-     */
+	 */
-    final static String FQCN = org.slf4j.helpers.AbstractLogger.class.getName();
 
-    // Does the log4j version in use recognize the TRACE level?
+	final static String FQCN_NOMINAL =  org.slf4j.helpers.AbstractLogger.class.getName();
-    // The trace level was introduced in log4j 1.2.12.
+	final static String FQCN_SUBSTITUE = FQCN_NOMINAL;
-    final boolean traceCapable;
+	final static String FQCN_FLUENT = org.slf4j.spi.DefaultLoggingEventBuilder.class.getName();
 
-    // WARN: Log4jLoggerAdapter constructor should have only package access so
+	
-    // that
+	// Does the log4j version in use recognize the TRACE level?
-    // only Log4jLoggerFactory be able to create one.
+	// The trace level was introduced in log4j 1.2.12.
-    Log4jLoggerAdapter(org.apache.log4j.Logger logger) {
+	final boolean traceCapable;
-        this.logger = logger;
-        this.name = logger.getName();
-        traceCapable = isTraceCapable();
-    }
 
-    private boolean isTraceCapable() {
+	// WARN: Log4jLoggerAdapter constructor should have only package access so
-        try {
+	// that only Log4jLoggerFactory be able to create one.
-            logger.isTraceEnabled();
+	Log4jLoggerAdapter(org.apache.log4j.Logger logger) {
-            return true;
+		this.logger = logger;
-        } catch (NoSuchMethodError e) {
+		this.name = logger.getName();
-            return false;
+		traceCapable = isTraceCapable();
-        }
+	}
-    }
 
-    /**
+	private boolean isTraceCapable() {
-     * Is this logger instance enabled for the TRACE level?
+		try {
-     * 
+			logger.isTraceEnabled();
-     * @return True if this Logger is enabled for level TRACE, false otherwise.
+			return true;
-     */
+		} catch (NoSuchMethodError e) {
-    public boolean isTraceEnabled() {
+			return false;
-        if (traceCapable) {
+		}
-            return logger.isTraceEnabled();
+	}
-        } else {
-            return logger.isDebugEnabled();
-        }
-    }
-
-    /**
-     * Is this logger instance enabled for the DEBUG level?
-     * 
-     * @return True if this Logger is enabled for level DEBUG, false otherwise.
-     */
-    public boolean isDebugEnabled() {
-        return logger.isDebugEnabled();
-    }
 
 
-    /**
+	/**
-     * Is this logger instance enabled for the INFO level?
+	 * Is this logger instance enabled for the TRACE level?
-     * 
+	 * 
-     * @return True if this Logger is enabled for the INFO level, false otherwise.
+	 * @return True if this Logger is enabled for level TRACE, false otherwise.
-     */
+	 */
-    public boolean isInfoEnabled() {
+	public boolean isTraceEnabled() {
-        return logger.isInfoEnabled();
+		if (traceCapable) {
-    }
+			return logger.isTraceEnabled();
+		} else {
+			return logger.isDebugEnabled();
+		}
+	}
 
-    /**
+	/**
-     * Is this logger instance enabled for the WARN level?
+	 * Is this logger instance enabled for the DEBUG level?
-     * 
+	 * 
-     * @return True if this Logger is enabled for the WARN level, false otherwise.
+	 * @return True if this Logger is enabled for level DEBUG, false otherwise.
-     */
+	 */
-    public boolean isWarnEnabled() {
+	public boolean isDebugEnabled() {
-        return logger.isEnabledFor(Level.WARN);
+		return logger.isDebugEnabled();
-    }
+	}
 
+	/**
+	 * Is this logger instance enabled for the INFO level?
+	 * 
+	 * @return True if this Logger is enabled for the INFO level, false otherwise.
+	 */
+	public boolean isInfoEnabled() {
+		return logger.isInfoEnabled();
+	}
 
-    /**
+	/**
-     * Is this logger instance enabled for level ERROR?
+	 * Is this logger instance enabled for the WARN level?
-     * 
+	 * 
-     * @return True if this Logger is enabled for level ERROR, false otherwise.
+	 * @return True if this Logger is enabled for the WARN level, false otherwise.
-     */
+	 */
-    public boolean isErrorEnabled() {
+	public boolean isWarnEnabled() {
-        return logger.isEnabledFor(Level.ERROR);
+		return logger.isEnabledFor(Level.WARN);
-    }
+	}
 
-
+	/**
-    @Override
+	 * Is this logger instance enabled for level ERROR?
-    public void log(Marker marker, String callerFQCN, int level, String msg, Object[] arguments, Throwable t) {
+	 * 
-        Level log4jLevel = toLog4jLevel(level);
+	 * @return True if this Logger is enabled for level ERROR, false otherwise.
-        NormalizedParameters np = NormalizedParameters.normalize(msg, arguments, t);
+	 */
-        String formattedMessage = MessageFormatter.basicArrayFormat(np.getMessage(), np.getArguments());
+	public boolean isErrorEnabled() {
-        logger.log(callerFQCN, log4jLevel, formattedMessage, np.getThrowable());
+		return logger.isEnabledFor(Level.ERROR);
-    }
+	}
 
 	@Override
-	protected void handleNormalizedLoggingCall(org.slf4j.event.Level level, Marker marker, String msg, Object[] arguments,
+	public void log(Marker marker, String callerFQCN, int level, String msg, Object[] arguments, Throwable t) {
-			Throwable throwable) {
+		Level log4jLevel = toLog4jLevel(level);
+		NormalizedParameters np = NormalizedParameters.normalize(msg, arguments, t);
+		String formattedMessage = MessageFormatter.basicArrayFormat(np.getMessage(), np.getArguments());
+		logger.log(callerFQCN, log4jLevel, formattedMessage, np.getThrowable());
+	}
+
+	@Override
+	protected void handleNormalizedLoggingCall(org.slf4j.event.Level level, Marker marker, String msg,
+			Object[] arguments, Throwable throwable) {
 		Level log4jLevel = toLog4jLevel(level.toInt());
 		String formattedMessage = MessageFormatter.basicArrayFormat(msg, arguments);
 		logger.log(getFullyQualifiedCallerName(), log4jLevel, formattedMessage, throwable);
 	}
 
 	/**
-	 * Called by {@link SubstituteLogger}
+	 * Called by {@link SubstituteLogger} or by {@link LoggingEventBuilder} instances
 	 * @param event
 	 */
     public void log(LoggingEvent event) {
@@ -169,57 +176,65 @@ public final class Log4jLoggerAdapter extends LegacyAbstractLogger implements Lo
         if (!logger.isEnabledFor(log4jLevel))
             return;
 
-        org.apache.log4j.spi.LoggingEvent log4jevent = toLog4jEvent(event, log4jLevel);
+        org.apache.log4j.spi.LoggingEvent log4jevent = event2Log4jEvent(event, log4jLevel);
         logger.callAppenders(log4jevent);
 
     }
-    
-    private org.apache.log4j.spi.LoggingEvent toLog4jEvent(LoggingEvent event, Level log4jLevel) {
 
-        String formattedMessage = MessageFormatter.basicArrayFormat(event.getMessage(), event.getArgumentArray());
+	private org.apache.log4j.spi.LoggingEvent event2Log4jEvent(LoggingEvent event, Level log4jLevel) {
 
-        LocationInfo locationInfo = new LocationInfo(NA_SUBST, NA_SUBST, NA_SUBST, "0");
+		String formattedMessage = MessageFormatter.basicArrayFormat(event.getMessage(), event.getArgumentArray());
 
-        ThrowableInformation ti = null;
+		LocationInfo locationInfo = null; 
-        Throwable t = event.getThrowable();
+		String fcqn = null;
-        if (t != null)
+		
-            ti = new ThrowableInformation(t);
+		if(event instanceof SubstituteLoggingEvent) {
+			locationInfo = new LocationInfo(NA_SUBST, NA_SUBST, NA_SUBST, "0");
+			fcqn = FQCN_SUBSTITUE;
+		} else {
+			fcqn = FQCN_FLUENT;
+		}
+		
+		
+		ThrowableInformation ti = null;
+		Throwable t = event.getThrowable();
+		if (t != null)
+			ti = new ThrowableInformation(t);
 
-        org.apache.log4j.spi.LoggingEvent log4jEvent = new org.apache.log4j.spi.LoggingEvent(FQCN, logger, event.getTimeStamp(), log4jLevel, formattedMessage,
+		org.apache.log4j.spi.LoggingEvent log4jEvent = new org.apache.log4j.spi.LoggingEvent(fcqn, logger,
-                        event.getThreadName(), ti, null, locationInfo, null);
+				event.getTimeStamp(), log4jLevel, formattedMessage, event.getThreadName(), ti, null, locationInfo,
+				null);
 
-        return log4jEvent;
+		return log4jEvent;
-    }
+	}
 
-
+	private Level toLog4jLevel(int slf4jLevelInt) {
-	
+		Level log4jLevel;
-    private Level toLog4jLevel(int slf4jLevelInt) {
+		switch (slf4jLevelInt) {
-        Level log4jLevel;
+		case LocationAwareLogger.TRACE_INT:
-        switch (slf4jLevelInt) {
+			log4jLevel = traceCapable ? Level.TRACE : Level.DEBUG;
-        case LocationAwareLogger.TRACE_INT:
+			break;
-            log4jLevel = traceCapable ? Level.TRACE : Level.DEBUG;
+		case LocationAwareLogger.DEBUG_INT:
-            break;
+			log4jLevel = Level.DEBUG;
-        case LocationAwareLogger.DEBUG_INT:
+			break;
-            log4jLevel = Level.DEBUG;
+		case LocationAwareLogger.INFO_INT:
-            break;
+			log4jLevel = Level.INFO;
-        case LocationAwareLogger.INFO_INT:
+			break;
-            log4jLevel = Level.INFO;
+		case LocationAwareLogger.WARN_INT:
-            break;
+			log4jLevel = Level.WARN;
-        case LocationAwareLogger.WARN_INT:
+			break;
-            log4jLevel = Level.WARN;
+		case LocationAwareLogger.ERROR_INT:
-            break;
+			log4jLevel = Level.ERROR;
-        case LocationAwareLogger.ERROR_INT:
+			break;
-            log4jLevel = Level.ERROR;
+		default:
-            break;
+			throw new IllegalStateException("Level number " + slf4jLevelInt + " is not recognized.");
-        default:
+		}
-            throw new IllegalStateException("Level number " + slf4jLevelInt + " is not recognized.");
+		return log4jLevel;
-        }
+	}
-        return log4jLevel;
-    }
 
 	@Override
 	protected String getFullyQualifiedCallerName() {
-		return FQCN;
+		return FQCN_NOMINAL;
 	}
 
 }