Make it possible to get a MessageFactory2 from Logger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/2e9fdc13 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/2e9fdc13 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/2e9fdc13 Branch: refs/heads/LOG4J-1181 Commit: 2e9fdc135545eee435cad14ee9d74101c93694be Parents: 8363d05 Author: Mikael Ståldal <[email protected]> Authored: Fri Jun 10 14:52:03 2016 +0200 Committer: Mikael Ståldal <[email protected]> Committed: Fri Jun 10 14:52:03 2016 +0200 ---------------------------------------------------------------------- log4j-api/src/main/java/org/apache/logging/log4j/Logger.java | 5 +++-- .../main/java/org/apache/logging/log4j/spi/AbstractLogger.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2e9fdc13/log4j-api/src/main/java/org/apache/logging/log4j/Logger.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/Logger.java b/log4j-api/src/main/java/org/apache/logging/log4j/Logger.java index e22ff32..5885cc8 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/Logger.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/Logger.java @@ -19,6 +19,7 @@ package org.apache.logging.log4j; import org.apache.logging.log4j.message.EntryMessage; import org.apache.logging.log4j.message.Message; import org.apache.logging.log4j.message.MessageFactory; +import org.apache.logging.log4j.message.MessageFactory2; import org.apache.logging.log4j.util.MessageSupplier; import org.apache.logging.log4j.util.Supplier; @@ -1749,9 +1750,9 @@ public interface Logger { /** * Gets the message factory used to convert message Objects and Strings into actual log Messages. * - * @return the message factory. + * @return the message factory, as an instance of {@link MessageFactory2} */ - MessageFactory getMessageFactory(); + <MF extends MessageFactory> MF getMessageFactory(); /** * Gets the logger name. http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2e9fdc13/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java index 8707595..bb4886a 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java @@ -1221,8 +1221,9 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable { logIfEnabled(FQCN, Level.FATAL, null, message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9); } + @SuppressWarnings("unchecked") @Override - public MessageFactory getMessageFactory() { + public MessageFactory2 getMessageFactory() { return messageFactory; }
