Remove MessageFactory accessor from Scala Logger interface
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/22bf2072 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/22bf2072 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/22bf2072 Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure Commit: 22bf207213cef5f7a4f0be6eee9cf64a7b4762ef Parents: 65995bb Author: Mikael Ståldal <mikael.stal...@magine.com> Authored: Fri Jul 1 11:38:02 2016 +0200 Committer: Mikael Ståldal <mikael.stal...@magine.com> Committed: Fri Jul 1 11:38:02 2016 +0200 ---------------------------------------------------------------------- .../main/scala/org/apache/logging/log4j/scala/Logger.scala | 9 ++------- .../main/scala/org/apache/logging/log4j/scala/Logger.scala | 9 ++------- .../org/apache/logging/log4j/scalasample/LoggingApp.scala | 5 +++-- 3 files changed, 7 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/22bf2072/log4j-api-scala_2.10/src/main/scala/org/apache/logging/log4j/scala/Logger.scala ---------------------------------------------------------------------- diff --git a/log4j-api-scala_2.10/src/main/scala/org/apache/logging/log4j/scala/Logger.scala b/log4j-api-scala_2.10/src/main/scala/org/apache/logging/log4j/scala/Logger.scala index 85efda4..7e3a83c 100644 --- a/log4j-api-scala_2.10/src/main/scala/org/apache/logging/log4j/scala/Logger.scala +++ b/log4j-api-scala_2.10/src/main/scala/org/apache/logging/log4j/scala/Logger.scala @@ -575,11 +575,6 @@ class Logger private(val delegate: ExtendedLogger) { */ def name: String = delegate.getName - /** - * @return the message factory used to convert message Objects and Strings/CharSequences into actual log Messages - */ - def messageFactory: MessageFactory2 = delegate.getMessageFactory.asInstanceOf[MessageFactory2] - /** Always logs a message at the specified level. It is the responsibility of the caller to ensure the specified * level is enabled. @@ -606,7 +601,7 @@ class Logger private(val delegate: ExtendedLogger) { * @param cause cause or `null` */ def logMessage(level: Level, marker: Marker, message: CharSequence, cause: Throwable): Unit = { - delegate.logMessage(FQCN, level, marker, messageFactory.newMessage(message), cause) + delegate.logMessage(FQCN, level, marker, delegate.getMessageFactory.asInstanceOf[MessageFactory2].newMessage(message), cause) } /** Always logs a message at the specified level. It is the responsibility of the caller to ensure the specified @@ -620,7 +615,7 @@ class Logger private(val delegate: ExtendedLogger) { * @param cause cause or `null` */ def logMessage(level: Level, marker: Marker, message: AnyRef, cause: Throwable): Unit = { - delegate.logMessage(FQCN, level, marker, messageFactory.newMessage(message), cause) + delegate.logMessage(FQCN, level, marker, delegate.getMessageFactory.asInstanceOf[MessageFactory2].newMessage(message), cause) } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/22bf2072/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/Logger.scala ---------------------------------------------------------------------- diff --git a/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/Logger.scala b/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/Logger.scala index 85efda4..7e3a83c 100644 --- a/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/Logger.scala +++ b/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/Logger.scala @@ -575,11 +575,6 @@ class Logger private(val delegate: ExtendedLogger) { */ def name: String = delegate.getName - /** - * @return the message factory used to convert message Objects and Strings/CharSequences into actual log Messages - */ - def messageFactory: MessageFactory2 = delegate.getMessageFactory.asInstanceOf[MessageFactory2] - /** Always logs a message at the specified level. It is the responsibility of the caller to ensure the specified * level is enabled. @@ -606,7 +601,7 @@ class Logger private(val delegate: ExtendedLogger) { * @param cause cause or `null` */ def logMessage(level: Level, marker: Marker, message: CharSequence, cause: Throwable): Unit = { - delegate.logMessage(FQCN, level, marker, messageFactory.newMessage(message), cause) + delegate.logMessage(FQCN, level, marker, delegate.getMessageFactory.asInstanceOf[MessageFactory2].newMessage(message), cause) } /** Always logs a message at the specified level. It is the responsibility of the caller to ensure the specified @@ -620,7 +615,7 @@ class Logger private(val delegate: ExtendedLogger) { * @param cause cause or `null` */ def logMessage(level: Level, marker: Marker, message: AnyRef, cause: Throwable): Unit = { - delegate.logMessage(FQCN, level, marker, messageFactory.newMessage(message), cause) + delegate.logMessage(FQCN, level, marker, delegate.getMessageFactory.asInstanceOf[MessageFactory2].newMessage(message), cause) } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/22bf2072/log4j-samples/scala-api/src/main/scala/org/apache/logging/log4j/scalasample/LoggingApp.scala ---------------------------------------------------------------------- diff --git a/log4j-samples/scala-api/src/main/scala/org/apache/logging/log4j/scalasample/LoggingApp.scala b/log4j-samples/scala-api/src/main/scala/org/apache/logging/log4j/scalasample/LoggingApp.scala index d47fb04..f00b9ee 100644 --- a/log4j-samples/scala-api/src/main/scala/org/apache/logging/log4j/scalasample/LoggingApp.scala +++ b/log4j-samples/scala-api/src/main/scala/org/apache/logging/log4j/scalasample/LoggingApp.scala @@ -1,5 +1,6 @@ package org.apache.logging.log4j.scalasample +import org.apache.logging.log4j.message.MessageFactory2 import org.apache.logging.log4j.scala.Logging object LoggingApp extends App with Logging { @@ -10,12 +11,12 @@ object LoggingApp extends App with Logging { logger.traceEntry() logger.traceEntry(s1, s2) - val entryMessage = logger.traceEntry(logger.messageFactory.newMessage("foobar": CharSequence)) + val entryMessage = logger.traceEntry(logger.delegate.getMessageFactory.asInstanceOf[MessageFactory2].newMessage("foobar": CharSequence)) logger.traceExit() logger.traceExit(s2) logger.traceExit(entryMessage) logger.traceExit(entryMessage, s2) - logger.traceExit(logger.messageFactory.newMessage("bonsai": CharSequence), s2) + logger.traceExit(logger.delegate.getMessageFactory.asInstanceOf[MessageFactory2].newMessage("bonsai": CharSequence), s2) } \ No newline at end of file