Repository: logging-log4j2 Updated Branches: refs/heads/LOG4J-1181 1e9585001 -> 31149ae6b
CharSequence log message Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/31149ae6 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/31149ae6 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/31149ae6 Branch: refs/heads/LOG4J-1181 Commit: 31149ae6b2d305b37af858985e758b63fe339db6 Parents: 1e95850 Author: Mikael Ståldal <[email protected]> Authored: Tue Jun 7 11:09:23 2016 +0200 Committer: Mikael Ståldal <[email protected]> Committed: Tue Jun 7 11:10:31 2016 +0200 ---------------------------------------------------------------------- .../org/apache/logging/log4j/scala/Logger.scala | 60 ++++++++++---------- .../logging/log4j/scala/LoggerMacro.scala | 57 +++++++++---------- .../apache/logging/log4j/scala/LoggerTest.scala | 6 +- .../org/apache/logging/log4j/scala/Logger.scala | 60 ++++++++++---------- .../logging/log4j/scala/LoggerMacro.scala | 57 +++++++++---------- .../apache/logging/log4j/scala/LoggerTest.scala | 6 +- 6 files changed, 122 insertions(+), 124 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/31149ae6/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 ad35a7a..0ce7765 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 @@ -16,7 +16,7 @@ */ package org.apache.logging.log4j.scala -import org.apache.logging.log4j.message.{MessageFactory, Message} +import org.apache.logging.log4j.message.{Message, MessageFactory} import org.apache.logging.log4j.spi.ExtendedLogger import org.apache.logging.log4j.{Level, Marker} @@ -32,22 +32,22 @@ class Logger(val delegate: ExtendedLogger) { def fatal(marker: Marker, message: Message, cause: Throwable): Unit = macro LoggerMacro.fatalMarkerMsgThrowable - def fatal(marker: Marker, message: String): Unit = + def fatal(marker: Marker, message: CharSequence): Unit = macro LoggerMacro.fatalMarkerString - def fatal(marker: Marker, message: String, cause: Throwable): Unit = + def fatal(marker: Marker, message: CharSequence, cause: Throwable): Unit = macro LoggerMacro.fatalMarkerStringThrowable def fatal(message: Message): Unit = macro LoggerMacro.fatalMsg - def fatal(message: String): Unit = + def fatal(message: CharSequence): Unit = macro LoggerMacro.fatalString def fatal(message: Message, cause: Throwable): Unit = macro LoggerMacro.fatalMsgThrowable - def fatal(message: String, cause: Throwable): Unit = + def fatal(message: CharSequence, cause: Throwable): Unit = macro LoggerMacro.fatalStringThrowable def error(marker: Marker, message: Message): Unit = @@ -56,22 +56,22 @@ class Logger(val delegate: ExtendedLogger) { def error(marker: Marker, message: Message, cause: Throwable): Unit = macro LoggerMacro.errorMarkerMsgThrowable - def error(marker: Marker, message: String): Unit = + def error(marker: Marker, message: CharSequence): Unit = macro LoggerMacro.errorMarkerString - def error(marker: Marker, message: String, cause: Throwable): Unit = + def error(marker: Marker, message: CharSequence, cause: Throwable): Unit = macro LoggerMacro.errorMarkerStringThrowable def error(message: Message): Unit = macro LoggerMacro.errorMsg - def error(message: String): Unit = + def error(message: CharSequence): Unit = macro LoggerMacro.errorString def error(message: Message, cause: Throwable): Unit = macro LoggerMacro.errorMsgThrowable - def error(message: String, cause: Throwable): Unit = + def error(message: CharSequence, cause: Throwable): Unit = macro LoggerMacro.errorStringThrowable def warn(marker: Marker, message: Message): Unit = @@ -80,22 +80,22 @@ class Logger(val delegate: ExtendedLogger) { def warn(marker: Marker, message: Message, cause: Throwable): Unit = macro LoggerMacro.warnMarkerMsgThrowable - def warn(marker: Marker, message: String): Unit = + def warn(marker: Marker, message: CharSequence): Unit = macro LoggerMacro.warnMarkerString - def warn(marker: Marker, message: String, cause: Throwable): Unit = + def warn(marker: Marker, message: CharSequence, cause: Throwable): Unit = macro LoggerMacro.warnMarkerStringThrowable def warn(message: Message): Unit = macro LoggerMacro.warnMsg - def warn(message: String): Unit = + def warn(message: CharSequence): Unit = macro LoggerMacro.warnString def warn(message: Message, cause: Throwable): Unit = macro LoggerMacro.warnMsgThrowable - def warn(message: String, cause: Throwable): Unit = + def warn(message: CharSequence, cause: Throwable): Unit = macro LoggerMacro.warnStringThrowable def info(marker: Marker, message: Message): Unit = @@ -104,22 +104,22 @@ class Logger(val delegate: ExtendedLogger) { def info(marker: Marker, message: Message, cause: Throwable): Unit = macro LoggerMacro.infoMarkerMsgThrowable - def info(marker: Marker, message: String): Unit = + def info(marker: Marker, message: CharSequence): Unit = macro LoggerMacro.infoMarkerString - def info(marker: Marker, message: String, cause: Throwable): Unit = + def info(marker: Marker, message: CharSequence, cause: Throwable): Unit = macro LoggerMacro.infoMarkerStringThrowable def info(message: Message): Unit = macro LoggerMacro.infoMsg - def info(message: String): Unit = + def info(message: CharSequence): Unit = macro LoggerMacro.infoString def info(message: Message, cause: Throwable): Unit = macro LoggerMacro.infoMsgThrowable - def info(message: String, cause: Throwable): Unit = + def info(message: CharSequence, cause: Throwable): Unit = macro LoggerMacro.infoStringThrowable def debug(marker: Marker, message: Message): Unit = @@ -128,22 +128,22 @@ class Logger(val delegate: ExtendedLogger) { def debug(marker: Marker, message: Message, cause: Throwable): Unit = macro LoggerMacro.debugMarkerMsgThrowable - def debug(marker: Marker, message: String): Unit = + def debug(marker: Marker, message: CharSequence): Unit = macro LoggerMacro.debugMarkerString - def debug(marker: Marker, message: String, cause: Throwable): Unit = + def debug(marker: Marker, message: CharSequence, cause: Throwable): Unit = macro LoggerMacro.debugMarkerStringThrowable def debug(message: Message): Unit = macro LoggerMacro.debugMsg - def debug(message: String): Unit = + def debug(message: CharSequence): Unit = macro LoggerMacro.debugString def debug(message: Message, cause: Throwable): Unit = macro LoggerMacro.debugMsgThrowable - def debug(message: String, cause: Throwable): Unit = + def debug(message: CharSequence, cause: Throwable): Unit = macro LoggerMacro.debugStringThrowable def trace(marker: Marker, message: Message): Unit = @@ -152,22 +152,22 @@ class Logger(val delegate: ExtendedLogger) { def trace(marker: Marker, message: Message, cause: Throwable): Unit = macro LoggerMacro.traceMarkerMsgThrowable - def trace(marker: Marker, message: String): Unit = + def trace(marker: Marker, message: CharSequence): Unit = macro LoggerMacro.traceMarkerString - def trace(marker: Marker, message: String, cause: Throwable): Unit = + def trace(marker: Marker, message: CharSequence, cause: Throwable): Unit = macro LoggerMacro.traceMarkerStringThrowable def trace(message: Message): Unit = macro LoggerMacro.traceMsg - def trace(message: String): Unit = + def trace(message: CharSequence): Unit = macro LoggerMacro.traceString def trace(message: Message, cause: Throwable): Unit = macro LoggerMacro.traceMsgThrowable - def trace(message: String, cause: Throwable): Unit = + def trace(message: CharSequence, cause: Throwable): Unit = macro LoggerMacro.traceStringThrowable def log(level: Level, marker: Marker, message: Message): Unit = @@ -176,22 +176,22 @@ class Logger(val delegate: ExtendedLogger) { def log(level: Level, marker: Marker, message: Message, cause: Throwable): Unit = macro LoggerMacro.logMarkerMsgThrowable - def log(level: Level, marker: Marker, message: String): Unit = + def log(level: Level, marker: Marker, message: CharSequence): Unit = macro LoggerMacro.logMarkerString - def log(level: Level, marker: Marker, message: String, cause: Throwable): Unit = + def log(level: Level, marker: Marker, message: CharSequence, cause: Throwable): Unit = macro LoggerMacro.logMarkerStringThrowable def log(level: Level, message: Message): Unit = macro LoggerMacro.logMsg - def log(level: Level, message: String): Unit = + def log(level: Level, message: CharSequence): Unit = macro LoggerMacro.logString def log(level: Level, message: Message, cause: Throwable): Unit = macro LoggerMacro.logMsgThrowable - def log(level: Level, message: String, cause: Throwable): Unit = + def log(level: Level, message: CharSequence, cause: Throwable): Unit = macro LoggerMacro.logStringThrowable def isEnabled(level: Level): Boolean = delegate.isEnabled(level) @@ -245,7 +245,7 @@ class Logger(val delegate: ExtendedLogger) { * @param message message * @param cause cause or `null` */ - def logMessage(level: Level, marker: Marker, message: String, cause: Throwable): Unit = { + def logMessage(level: Level, marker: Marker, message: CharSequence, cause: Throwable): Unit = { delegate.logMessage(FQCN, level, marker, delegate.getMessageFactory.newMessage(message), cause) } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/31149ae6/log4j-api-scala_2.10/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala ---------------------------------------------------------------------- diff --git a/log4j-api-scala_2.10/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala b/log4j-api-scala_2.10/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala index f2de50e..e18679f 100644 --- a/log4j-api-scala_2.10/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala +++ b/log4j-api-scala_2.10/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala @@ -20,7 +20,6 @@ import org.apache.logging.log4j.message.Message import org.apache.logging.log4j.{Level, Marker} import scala.language.experimental.macros - import scala.reflect.macros.Context private object LoggerMacro { @@ -33,10 +32,10 @@ private object LoggerMacro { def fatalMarkerMsgThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message], cause: c.Expr[Throwable]) = logMarkerMsgThrowable(c)(c.universe.reify(Level.FATAL), marker, message, cause) - def fatalMarkerString(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[String]) = + def fatalMarkerString(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence]) = logMarkerString(c)(c.universe.reify(Level.FATAL), marker, message) - def fatalMarkerStringThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[String], cause: c.Expr[Throwable]) = + def fatalMarkerStringThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence], cause: c.Expr[Throwable]) = logMarkerStringThrowable(c)(c.universe.reify(Level.FATAL), marker, message, cause) def fatalMsg(c: LoggerContext)(message: c.Expr[Message]) = @@ -45,10 +44,10 @@ private object LoggerMacro { def fatalMsgThrowable(c: LoggerContext)(message: c.Expr[Message], cause: c.Expr[Throwable]) = logMsgThrowable(c)(c.universe.reify(Level.FATAL), message, cause) - def fatalString(c: LoggerContext)(message: c.Expr[String]) = + def fatalString(c: LoggerContext)(message: c.Expr[CharSequence]) = logString(c)(c.universe.reify(Level.FATAL), message) - def fatalStringThrowable(c: LoggerContext)(message: c.Expr[String], cause: c.Expr[Throwable]) = + def fatalStringThrowable(c: LoggerContext)(message: c.Expr[CharSequence], cause: c.Expr[Throwable]) = logStringThrowable(c)(c.universe.reify(Level.FATAL), message, cause) def errorMarkerMsg(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message]) = @@ -57,10 +56,10 @@ private object LoggerMacro { def errorMarkerMsgThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message], cause: c.Expr[Throwable]) = logMarkerMsgThrowable(c)(c.universe.reify(Level.ERROR), marker, message, cause) - def errorMarkerString(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[String]) = + def errorMarkerString(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence]) = logMarkerString(c)(c.universe.reify(Level.ERROR), marker, message) - def errorMarkerStringThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[String], cause: c.Expr[Throwable]) = + def errorMarkerStringThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence], cause: c.Expr[Throwable]) = logMarkerStringThrowable(c)(c.universe.reify(Level.ERROR), marker, message, cause) def errorMsg(c: LoggerContext)(message: c.Expr[Message]) = @@ -69,10 +68,10 @@ private object LoggerMacro { def errorMsgThrowable(c: LoggerContext)(message: c.Expr[Message], cause: c.Expr[Throwable]) = logMsgThrowable(c)(c.universe.reify(Level.ERROR), message, cause) - def errorString(c: LoggerContext)(message: c.Expr[String]) = + def errorString(c: LoggerContext)(message: c.Expr[CharSequence]) = logString(c)(c.universe.reify(Level.ERROR), message) - def errorStringThrowable(c: LoggerContext)(message: c.Expr[String], cause: c.Expr[Throwable]) = + def errorStringThrowable(c: LoggerContext)(message: c.Expr[CharSequence], cause: c.Expr[Throwable]) = logStringThrowable(c)(c.universe.reify(Level.ERROR), message, cause) def warnMarkerMsg(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message]) = @@ -81,10 +80,10 @@ private object LoggerMacro { def warnMarkerMsgThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message], cause: c.Expr[Throwable]) = logMarkerMsgThrowable(c)(c.universe.reify(Level.WARN), marker, message, cause) - def warnMarkerString(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[String]) = + def warnMarkerString(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence]) = logMarkerString(c)(c.universe.reify(Level.WARN), marker, message) - def warnMarkerStringThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[String], cause: c.Expr[Throwable]) = + def warnMarkerStringThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence], cause: c.Expr[Throwable]) = logMarkerStringThrowable(c)(c.universe.reify(Level.WARN), marker, message, cause) def warnMsg(c: LoggerContext)(message: c.Expr[Message]) = @@ -93,10 +92,10 @@ private object LoggerMacro { def warnMsgThrowable(c: LoggerContext)(message: c.Expr[Message], cause: c.Expr[Throwable]) = logMsgThrowable(c)(c.universe.reify(Level.WARN), message, cause) - def warnString(c: LoggerContext)(message: c.Expr[String]) = + def warnString(c: LoggerContext)(message: c.Expr[CharSequence]) = logString(c)(c.universe.reify(Level.WARN), message) - def warnStringThrowable(c: LoggerContext)(message: c.Expr[String], cause: c.Expr[Throwable]) = + def warnStringThrowable(c: LoggerContext)(message: c.Expr[CharSequence], cause: c.Expr[Throwable]) = logStringThrowable(c)(c.universe.reify(Level.WARN), message, cause) def infoMarkerMsg(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message]) = @@ -105,10 +104,10 @@ private object LoggerMacro { def infoMarkerMsgThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message], cause: c.Expr[Throwable]) = logMarkerMsgThrowable(c)(c.universe.reify(Level.INFO), marker, message, cause) - def infoMarkerString(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[String]) = + def infoMarkerString(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence]) = logMarkerString(c)(c.universe.reify(Level.INFO), marker, message) - def infoMarkerStringThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[String], cause: c.Expr[Throwable]) = + def infoMarkerStringThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence], cause: c.Expr[Throwable]) = logMarkerStringThrowable(c)(c.universe.reify(Level.INFO), marker, message, cause) def infoMsg(c: LoggerContext)(message: c.Expr[Message]) = @@ -117,10 +116,10 @@ private object LoggerMacro { def infoMsgThrowable(c: LoggerContext)(message: c.Expr[Message], cause: c.Expr[Throwable]) = logMsgThrowable(c)(c.universe.reify(Level.INFO), message, cause) - def infoString(c: LoggerContext)(message: c.Expr[String]) = + def infoString(c: LoggerContext)(message: c.Expr[CharSequence]) = logString(c)(c.universe.reify(Level.INFO), message) - def infoStringThrowable(c: LoggerContext)(message: c.Expr[String], cause: c.Expr[Throwable]) = + def infoStringThrowable(c: LoggerContext)(message: c.Expr[CharSequence], cause: c.Expr[Throwable]) = logStringThrowable(c)(c.universe.reify(Level.INFO), message, cause) def debugMarkerMsg(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message]) = @@ -129,10 +128,10 @@ private object LoggerMacro { def debugMarkerMsgThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message], cause: c.Expr[Throwable]) = logMarkerMsgThrowable(c)(c.universe.reify(Level.DEBUG), marker, message, cause) - def debugMarkerString(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[String]) = + def debugMarkerString(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence]) = logMarkerString(c)(c.universe.reify(Level.DEBUG), marker, message) - def debugMarkerStringThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[String], cause: c.Expr[Throwable]) = + def debugMarkerStringThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence], cause: c.Expr[Throwable]) = logMarkerStringThrowable(c)(c.universe.reify(Level.DEBUG), marker, message, cause) def debugMsg(c: LoggerContext)(message: c.Expr[Message]) = @@ -141,10 +140,10 @@ private object LoggerMacro { def debugMsgThrowable(c: LoggerContext)(message: c.Expr[Message], cause: c.Expr[Throwable]) = logMsgThrowable(c)(c.universe.reify(Level.DEBUG), message, cause) - def debugString(c: LoggerContext)(message: c.Expr[String]) = + def debugString(c: LoggerContext)(message: c.Expr[CharSequence]) = logString(c)(c.universe.reify(Level.DEBUG), message) - def debugStringThrowable(c: LoggerContext)(message: c.Expr[String], cause: c.Expr[Throwable]) = + def debugStringThrowable(c: LoggerContext)(message: c.Expr[CharSequence], cause: c.Expr[Throwable]) = logStringThrowable(c)(c.universe.reify(Level.DEBUG), message, cause) def traceMarkerMsg(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message]) = @@ -153,10 +152,10 @@ private object LoggerMacro { def traceMarkerMsgThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message], cause: c.Expr[Throwable]) = logMarkerMsgThrowable(c)(c.universe.reify(Level.TRACE), marker, message, cause) - def traceMarkerString(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[String]) = + def traceMarkerString(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence]) = logMarkerString(c)(c.universe.reify(Level.TRACE), marker, message) - def traceMarkerStringThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[String], cause: c.Expr[Throwable]) = + def traceMarkerStringThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence], cause: c.Expr[Throwable]) = logMarkerStringThrowable(c)(c.universe.reify(Level.TRACE), marker, message, cause) def traceMsg(c: LoggerContext)(message: c.Expr[Message]) = @@ -165,10 +164,10 @@ private object LoggerMacro { def traceMsgThrowable(c: LoggerContext)(message: c.Expr[Message], cause: c.Expr[Throwable]) = logMsgThrowable(c)(c.universe.reify(Level.TRACE), message, cause) - def traceString(c: LoggerContext)(message: c.Expr[String]) = + def traceString(c: LoggerContext)(message: c.Expr[CharSequence]) = logString(c)(c.universe.reify(Level.TRACE), message) - def traceStringThrowable(c: LoggerContext)(message: c.Expr[String], cause: c.Expr[Throwable]) = + def traceStringThrowable(c: LoggerContext)(message: c.Expr[CharSequence], cause: c.Expr[Throwable]) = logStringThrowable(c)(c.universe.reify(Level.TRACE), message, cause) def logMarkerMsg(c: LoggerContext)(level: c.Expr[Level], marker: c.Expr[Marker], message: c.Expr[Message]) = @@ -185,14 +184,14 @@ private object LoggerMacro { } ) - def logMarkerString(c: LoggerContext)(level: c.Expr[Level], marker: c.Expr[Marker], message: c.Expr[String]) = + def logMarkerString(c: LoggerContext)(level: c.Expr[Level], marker: c.Expr[Marker], message: c.Expr[CharSequence]) = c.universe.reify( if (c.prefix.splice.delegate.isEnabled(level.splice, marker.splice)) { c.prefix.splice.logMessage(level.splice, marker.splice, message.splice, null) } ) - def logMarkerStringThrowable(c: LoggerContext)(level: c.Expr[Level], marker: c.Expr[Marker], message: c.Expr[String], cause: c.Expr[Throwable]) = + def logMarkerStringThrowable(c: LoggerContext)(level: c.Expr[Level], marker: c.Expr[Marker], message: c.Expr[CharSequence], cause: c.Expr[Throwable]) = c.universe.reify( if (c.prefix.splice.delegate.isEnabled(level.splice, marker.splice)) { c.prefix.splice.logMessage(level.splice, marker.splice, message.splice, cause.splice) @@ -213,14 +212,14 @@ private object LoggerMacro { } ) - def logString(c: LoggerContext)(level: c.Expr[Level], message: c.Expr[String]) = + def logString(c: LoggerContext)(level: c.Expr[Level], message: c.Expr[CharSequence]) = c.universe.reify( if (c.prefix.splice.delegate.isEnabled(level.splice)) { c.prefix.splice.logMessage(level.splice, null, message.splice, null) } ) - def logStringThrowable(c: LoggerContext)(level: c.Expr[Level], message: c.Expr[String], cause: c.Expr[Throwable]) = + def logStringThrowable(c: LoggerContext)(level: c.Expr[Level], message: c.Expr[CharSequence], cause: c.Expr[Throwable]) = c.universe.reify( if (c.prefix.splice.delegate.isEnabled(level.splice)) { c.prefix.splice.logMessage(level.splice, null, message.splice, cause.splice) http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/31149ae6/log4j-api-scala_2.10/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala ---------------------------------------------------------------------- diff --git a/log4j-api-scala_2.10/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala b/log4j-api-scala_2.10/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala index aea687a..0979cf2 100644 --- a/log4j-api-scala_2.10/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala +++ b/log4j-api-scala_2.10/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala @@ -16,9 +16,9 @@ */ package org.apache.logging.log4j.scala -import org.apache.logging.log4j.message.{SimpleMessage, Message, ParameterizedMessageFactory} +import org.apache.logging.log4j.message.{Message, ParameterizedMessage, ParameterizedMessageFactory} import org.apache.logging.log4j.spi.ExtendedLogger -import org.apache.logging.log4j.{MarkerManager, Level, Marker} +import org.apache.logging.log4j.{Level, Marker, MarkerManager} import org.junit.runner.RunWith import org.mockito.Matchers.{any, anyString, eq => eqv} import org.mockito.Mockito._ @@ -30,7 +30,7 @@ import org.scalatest.{FunSuite, Matchers} class LoggerTest extends FunSuite with Matchers with MockitoSugar { val stringMsg = "string msg" - val msg = new SimpleMessage("simple msg") + val msg = new ParameterizedMessage("msg {}", 17) val cause = new RuntimeException("cause") val marker = MarkerManager.getMarker("marker") http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/31149ae6/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 ad35a7a..0ce7765 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 @@ -16,7 +16,7 @@ */ package org.apache.logging.log4j.scala -import org.apache.logging.log4j.message.{MessageFactory, Message} +import org.apache.logging.log4j.message.{Message, MessageFactory} import org.apache.logging.log4j.spi.ExtendedLogger import org.apache.logging.log4j.{Level, Marker} @@ -32,22 +32,22 @@ class Logger(val delegate: ExtendedLogger) { def fatal(marker: Marker, message: Message, cause: Throwable): Unit = macro LoggerMacro.fatalMarkerMsgThrowable - def fatal(marker: Marker, message: String): Unit = + def fatal(marker: Marker, message: CharSequence): Unit = macro LoggerMacro.fatalMarkerString - def fatal(marker: Marker, message: String, cause: Throwable): Unit = + def fatal(marker: Marker, message: CharSequence, cause: Throwable): Unit = macro LoggerMacro.fatalMarkerStringThrowable def fatal(message: Message): Unit = macro LoggerMacro.fatalMsg - def fatal(message: String): Unit = + def fatal(message: CharSequence): Unit = macro LoggerMacro.fatalString def fatal(message: Message, cause: Throwable): Unit = macro LoggerMacro.fatalMsgThrowable - def fatal(message: String, cause: Throwable): Unit = + def fatal(message: CharSequence, cause: Throwable): Unit = macro LoggerMacro.fatalStringThrowable def error(marker: Marker, message: Message): Unit = @@ -56,22 +56,22 @@ class Logger(val delegate: ExtendedLogger) { def error(marker: Marker, message: Message, cause: Throwable): Unit = macro LoggerMacro.errorMarkerMsgThrowable - def error(marker: Marker, message: String): Unit = + def error(marker: Marker, message: CharSequence): Unit = macro LoggerMacro.errorMarkerString - def error(marker: Marker, message: String, cause: Throwable): Unit = + def error(marker: Marker, message: CharSequence, cause: Throwable): Unit = macro LoggerMacro.errorMarkerStringThrowable def error(message: Message): Unit = macro LoggerMacro.errorMsg - def error(message: String): Unit = + def error(message: CharSequence): Unit = macro LoggerMacro.errorString def error(message: Message, cause: Throwable): Unit = macro LoggerMacro.errorMsgThrowable - def error(message: String, cause: Throwable): Unit = + def error(message: CharSequence, cause: Throwable): Unit = macro LoggerMacro.errorStringThrowable def warn(marker: Marker, message: Message): Unit = @@ -80,22 +80,22 @@ class Logger(val delegate: ExtendedLogger) { def warn(marker: Marker, message: Message, cause: Throwable): Unit = macro LoggerMacro.warnMarkerMsgThrowable - def warn(marker: Marker, message: String): Unit = + def warn(marker: Marker, message: CharSequence): Unit = macro LoggerMacro.warnMarkerString - def warn(marker: Marker, message: String, cause: Throwable): Unit = + def warn(marker: Marker, message: CharSequence, cause: Throwable): Unit = macro LoggerMacro.warnMarkerStringThrowable def warn(message: Message): Unit = macro LoggerMacro.warnMsg - def warn(message: String): Unit = + def warn(message: CharSequence): Unit = macro LoggerMacro.warnString def warn(message: Message, cause: Throwable): Unit = macro LoggerMacro.warnMsgThrowable - def warn(message: String, cause: Throwable): Unit = + def warn(message: CharSequence, cause: Throwable): Unit = macro LoggerMacro.warnStringThrowable def info(marker: Marker, message: Message): Unit = @@ -104,22 +104,22 @@ class Logger(val delegate: ExtendedLogger) { def info(marker: Marker, message: Message, cause: Throwable): Unit = macro LoggerMacro.infoMarkerMsgThrowable - def info(marker: Marker, message: String): Unit = + def info(marker: Marker, message: CharSequence): Unit = macro LoggerMacro.infoMarkerString - def info(marker: Marker, message: String, cause: Throwable): Unit = + def info(marker: Marker, message: CharSequence, cause: Throwable): Unit = macro LoggerMacro.infoMarkerStringThrowable def info(message: Message): Unit = macro LoggerMacro.infoMsg - def info(message: String): Unit = + def info(message: CharSequence): Unit = macro LoggerMacro.infoString def info(message: Message, cause: Throwable): Unit = macro LoggerMacro.infoMsgThrowable - def info(message: String, cause: Throwable): Unit = + def info(message: CharSequence, cause: Throwable): Unit = macro LoggerMacro.infoStringThrowable def debug(marker: Marker, message: Message): Unit = @@ -128,22 +128,22 @@ class Logger(val delegate: ExtendedLogger) { def debug(marker: Marker, message: Message, cause: Throwable): Unit = macro LoggerMacro.debugMarkerMsgThrowable - def debug(marker: Marker, message: String): Unit = + def debug(marker: Marker, message: CharSequence): Unit = macro LoggerMacro.debugMarkerString - def debug(marker: Marker, message: String, cause: Throwable): Unit = + def debug(marker: Marker, message: CharSequence, cause: Throwable): Unit = macro LoggerMacro.debugMarkerStringThrowable def debug(message: Message): Unit = macro LoggerMacro.debugMsg - def debug(message: String): Unit = + def debug(message: CharSequence): Unit = macro LoggerMacro.debugString def debug(message: Message, cause: Throwable): Unit = macro LoggerMacro.debugMsgThrowable - def debug(message: String, cause: Throwable): Unit = + def debug(message: CharSequence, cause: Throwable): Unit = macro LoggerMacro.debugStringThrowable def trace(marker: Marker, message: Message): Unit = @@ -152,22 +152,22 @@ class Logger(val delegate: ExtendedLogger) { def trace(marker: Marker, message: Message, cause: Throwable): Unit = macro LoggerMacro.traceMarkerMsgThrowable - def trace(marker: Marker, message: String): Unit = + def trace(marker: Marker, message: CharSequence): Unit = macro LoggerMacro.traceMarkerString - def trace(marker: Marker, message: String, cause: Throwable): Unit = + def trace(marker: Marker, message: CharSequence, cause: Throwable): Unit = macro LoggerMacro.traceMarkerStringThrowable def trace(message: Message): Unit = macro LoggerMacro.traceMsg - def trace(message: String): Unit = + def trace(message: CharSequence): Unit = macro LoggerMacro.traceString def trace(message: Message, cause: Throwable): Unit = macro LoggerMacro.traceMsgThrowable - def trace(message: String, cause: Throwable): Unit = + def trace(message: CharSequence, cause: Throwable): Unit = macro LoggerMacro.traceStringThrowable def log(level: Level, marker: Marker, message: Message): Unit = @@ -176,22 +176,22 @@ class Logger(val delegate: ExtendedLogger) { def log(level: Level, marker: Marker, message: Message, cause: Throwable): Unit = macro LoggerMacro.logMarkerMsgThrowable - def log(level: Level, marker: Marker, message: String): Unit = + def log(level: Level, marker: Marker, message: CharSequence): Unit = macro LoggerMacro.logMarkerString - def log(level: Level, marker: Marker, message: String, cause: Throwable): Unit = + def log(level: Level, marker: Marker, message: CharSequence, cause: Throwable): Unit = macro LoggerMacro.logMarkerStringThrowable def log(level: Level, message: Message): Unit = macro LoggerMacro.logMsg - def log(level: Level, message: String): Unit = + def log(level: Level, message: CharSequence): Unit = macro LoggerMacro.logString def log(level: Level, message: Message, cause: Throwable): Unit = macro LoggerMacro.logMsgThrowable - def log(level: Level, message: String, cause: Throwable): Unit = + def log(level: Level, message: CharSequence, cause: Throwable): Unit = macro LoggerMacro.logStringThrowable def isEnabled(level: Level): Boolean = delegate.isEnabled(level) @@ -245,7 +245,7 @@ class Logger(val delegate: ExtendedLogger) { * @param message message * @param cause cause or `null` */ - def logMessage(level: Level, marker: Marker, message: String, cause: Throwable): Unit = { + def logMessage(level: Level, marker: Marker, message: CharSequence, cause: Throwable): Unit = { delegate.logMessage(FQCN, level, marker, delegate.getMessageFactory.newMessage(message), cause) } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/31149ae6/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala ---------------------------------------------------------------------- diff --git a/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala b/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala index 5541c8b..bdd782d 100644 --- a/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala +++ b/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala @@ -20,7 +20,6 @@ import org.apache.logging.log4j.message.Message import org.apache.logging.log4j.{Level, Marker} import scala.language.experimental.macros - import scala.reflect.macros.blackbox.Context private object LoggerMacro { @@ -33,10 +32,10 @@ private object LoggerMacro { def fatalMarkerMsgThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message], cause: c.Expr[Throwable]) = logMarkerMsgThrowable(c)(c.universe.reify(Level.FATAL), marker, message, cause) - def fatalMarkerString(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[String]) = + def fatalMarkerString(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence]) = logMarkerString(c)(c.universe.reify(Level.FATAL), marker, message) - def fatalMarkerStringThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[String], cause: c.Expr[Throwable]) = + def fatalMarkerStringThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence], cause: c.Expr[Throwable]) = logMarkerStringThrowable(c)(c.universe.reify(Level.FATAL), marker, message, cause) def fatalMsg(c: LoggerContext)(message: c.Expr[Message]) = @@ -45,10 +44,10 @@ private object LoggerMacro { def fatalMsgThrowable(c: LoggerContext)(message: c.Expr[Message], cause: c.Expr[Throwable]) = logMsgThrowable(c)(c.universe.reify(Level.FATAL), message, cause) - def fatalString(c: LoggerContext)(message: c.Expr[String]) = + def fatalString(c: LoggerContext)(message: c.Expr[CharSequence]) = logString(c)(c.universe.reify(Level.FATAL), message) - def fatalStringThrowable(c: LoggerContext)(message: c.Expr[String], cause: c.Expr[Throwable]) = + def fatalStringThrowable(c: LoggerContext)(message: c.Expr[CharSequence], cause: c.Expr[Throwable]) = logStringThrowable(c)(c.universe.reify(Level.FATAL), message, cause) def errorMarkerMsg(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message]) = @@ -57,10 +56,10 @@ private object LoggerMacro { def errorMarkerMsgThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message], cause: c.Expr[Throwable]) = logMarkerMsgThrowable(c)(c.universe.reify(Level.ERROR), marker, message, cause) - def errorMarkerString(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[String]) = + def errorMarkerString(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence]) = logMarkerString(c)(c.universe.reify(Level.ERROR), marker, message) - def errorMarkerStringThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[String], cause: c.Expr[Throwable]) = + def errorMarkerStringThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence], cause: c.Expr[Throwable]) = logMarkerStringThrowable(c)(c.universe.reify(Level.ERROR), marker, message, cause) def errorMsg(c: LoggerContext)(message: c.Expr[Message]) = @@ -69,10 +68,10 @@ private object LoggerMacro { def errorMsgThrowable(c: LoggerContext)(message: c.Expr[Message], cause: c.Expr[Throwable]) = logMsgThrowable(c)(c.universe.reify(Level.ERROR), message, cause) - def errorString(c: LoggerContext)(message: c.Expr[String]) = + def errorString(c: LoggerContext)(message: c.Expr[CharSequence]) = logString(c)(c.universe.reify(Level.ERROR), message) - def errorStringThrowable(c: LoggerContext)(message: c.Expr[String], cause: c.Expr[Throwable]) = + def errorStringThrowable(c: LoggerContext)(message: c.Expr[CharSequence], cause: c.Expr[Throwable]) = logStringThrowable(c)(c.universe.reify(Level.ERROR), message, cause) def warnMarkerMsg(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message]) = @@ -81,10 +80,10 @@ private object LoggerMacro { def warnMarkerMsgThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message], cause: c.Expr[Throwable]) = logMarkerMsgThrowable(c)(c.universe.reify(Level.WARN), marker, message, cause) - def warnMarkerString(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[String]) = + def warnMarkerString(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence]) = logMarkerString(c)(c.universe.reify(Level.WARN), marker, message) - def warnMarkerStringThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[String], cause: c.Expr[Throwable]) = + def warnMarkerStringThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence], cause: c.Expr[Throwable]) = logMarkerStringThrowable(c)(c.universe.reify(Level.WARN), marker, message, cause) def warnMsg(c: LoggerContext)(message: c.Expr[Message]) = @@ -93,10 +92,10 @@ private object LoggerMacro { def warnMsgThrowable(c: LoggerContext)(message: c.Expr[Message], cause: c.Expr[Throwable]) = logMsgThrowable(c)(c.universe.reify(Level.WARN), message, cause) - def warnString(c: LoggerContext)(message: c.Expr[String]) = + def warnString(c: LoggerContext)(message: c.Expr[CharSequence]) = logString(c)(c.universe.reify(Level.WARN), message) - def warnStringThrowable(c: LoggerContext)(message: c.Expr[String], cause: c.Expr[Throwable]) = + def warnStringThrowable(c: LoggerContext)(message: c.Expr[CharSequence], cause: c.Expr[Throwable]) = logStringThrowable(c)(c.universe.reify(Level.WARN), message, cause) def infoMarkerMsg(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message]) = @@ -105,10 +104,10 @@ private object LoggerMacro { def infoMarkerMsgThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message], cause: c.Expr[Throwable]) = logMarkerMsgThrowable(c)(c.universe.reify(Level.INFO), marker, message, cause) - def infoMarkerString(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[String]) = + def infoMarkerString(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence]) = logMarkerString(c)(c.universe.reify(Level.INFO), marker, message) - def infoMarkerStringThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[String], cause: c.Expr[Throwable]) = + def infoMarkerStringThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence], cause: c.Expr[Throwable]) = logMarkerStringThrowable(c)(c.universe.reify(Level.INFO), marker, message, cause) def infoMsg(c: LoggerContext)(message: c.Expr[Message]) = @@ -117,10 +116,10 @@ private object LoggerMacro { def infoMsgThrowable(c: LoggerContext)(message: c.Expr[Message], cause: c.Expr[Throwable]) = logMsgThrowable(c)(c.universe.reify(Level.INFO), message, cause) - def infoString(c: LoggerContext)(message: c.Expr[String]) = + def infoString(c: LoggerContext)(message: c.Expr[CharSequence]) = logString(c)(c.universe.reify(Level.INFO), message) - def infoStringThrowable(c: LoggerContext)(message: c.Expr[String], cause: c.Expr[Throwable]) = + def infoStringThrowable(c: LoggerContext)(message: c.Expr[CharSequence], cause: c.Expr[Throwable]) = logStringThrowable(c)(c.universe.reify(Level.INFO), message, cause) def debugMarkerMsg(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message]) = @@ -129,10 +128,10 @@ private object LoggerMacro { def debugMarkerMsgThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message], cause: c.Expr[Throwable]) = logMarkerMsgThrowable(c)(c.universe.reify(Level.DEBUG), marker, message, cause) - def debugMarkerString(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[String]) = + def debugMarkerString(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence]) = logMarkerString(c)(c.universe.reify(Level.DEBUG), marker, message) - def debugMarkerStringThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[String], cause: c.Expr[Throwable]) = + def debugMarkerStringThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence], cause: c.Expr[Throwable]) = logMarkerStringThrowable(c)(c.universe.reify(Level.DEBUG), marker, message, cause) def debugMsg(c: LoggerContext)(message: c.Expr[Message]) = @@ -141,10 +140,10 @@ private object LoggerMacro { def debugMsgThrowable(c: LoggerContext)(message: c.Expr[Message], cause: c.Expr[Throwable]) = logMsgThrowable(c)(c.universe.reify(Level.DEBUG), message, cause) - def debugString(c: LoggerContext)(message: c.Expr[String]) = + def debugString(c: LoggerContext)(message: c.Expr[CharSequence]) = logString(c)(c.universe.reify(Level.DEBUG), message) - def debugStringThrowable(c: LoggerContext)(message: c.Expr[String], cause: c.Expr[Throwable]) = + def debugStringThrowable(c: LoggerContext)(message: c.Expr[CharSequence], cause: c.Expr[Throwable]) = logStringThrowable(c)(c.universe.reify(Level.DEBUG), message, cause) def traceMarkerMsg(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message]) = @@ -153,10 +152,10 @@ private object LoggerMacro { def traceMarkerMsgThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message], cause: c.Expr[Throwable]) = logMarkerMsgThrowable(c)(c.universe.reify(Level.TRACE), marker, message, cause) - def traceMarkerString(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[String]) = + def traceMarkerString(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence]) = logMarkerString(c)(c.universe.reify(Level.TRACE), marker, message) - def traceMarkerStringThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[String], cause: c.Expr[Throwable]) = + def traceMarkerStringThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence], cause: c.Expr[Throwable]) = logMarkerStringThrowable(c)(c.universe.reify(Level.TRACE), marker, message, cause) def traceMsg(c: LoggerContext)(message: c.Expr[Message]) = @@ -165,10 +164,10 @@ private object LoggerMacro { def traceMsgThrowable(c: LoggerContext)(message: c.Expr[Message], cause: c.Expr[Throwable]) = logMsgThrowable(c)(c.universe.reify(Level.TRACE), message, cause) - def traceString(c: LoggerContext)(message: c.Expr[String]) = + def traceString(c: LoggerContext)(message: c.Expr[CharSequence]) = logString(c)(c.universe.reify(Level.TRACE), message) - def traceStringThrowable(c: LoggerContext)(message: c.Expr[String], cause: c.Expr[Throwable]) = + def traceStringThrowable(c: LoggerContext)(message: c.Expr[CharSequence], cause: c.Expr[Throwable]) = logStringThrowable(c)(c.universe.reify(Level.TRACE), message, cause) def logMarkerMsg(c: LoggerContext)(level: c.Expr[Level], marker: c.Expr[Marker], message: c.Expr[Message]) = @@ -185,14 +184,14 @@ private object LoggerMacro { } ) - def logMarkerString(c: LoggerContext)(level: c.Expr[Level], marker: c.Expr[Marker], message: c.Expr[String]) = + def logMarkerString(c: LoggerContext)(level: c.Expr[Level], marker: c.Expr[Marker], message: c.Expr[CharSequence]) = c.universe.reify( if (c.prefix.splice.delegate.isEnabled(level.splice, marker.splice)) { c.prefix.splice.logMessage(level.splice, marker.splice, message.splice, null) } ) - def logMarkerStringThrowable(c: LoggerContext)(level: c.Expr[Level], marker: c.Expr[Marker], message: c.Expr[String], cause: c.Expr[Throwable]) = + def logMarkerStringThrowable(c: LoggerContext)(level: c.Expr[Level], marker: c.Expr[Marker], message: c.Expr[CharSequence], cause: c.Expr[Throwable]) = c.universe.reify( if (c.prefix.splice.delegate.isEnabled(level.splice, marker.splice)) { c.prefix.splice.logMessage(level.splice, marker.splice, message.splice, cause.splice) @@ -213,14 +212,14 @@ private object LoggerMacro { } ) - def logString(c: LoggerContext)(level: c.Expr[Level], message: c.Expr[String]) = + def logString(c: LoggerContext)(level: c.Expr[Level], message: c.Expr[CharSequence]) = c.universe.reify( if (c.prefix.splice.delegate.isEnabled(level.splice)) { c.prefix.splice.logMessage(level.splice, null, message.splice, null) } ) - def logStringThrowable(c: LoggerContext)(level: c.Expr[Level], message: c.Expr[String], cause: c.Expr[Throwable]) = + def logStringThrowable(c: LoggerContext)(level: c.Expr[Level], message: c.Expr[CharSequence], cause: c.Expr[Throwable]) = c.universe.reify( if (c.prefix.splice.delegate.isEnabled(level.splice)) { c.prefix.splice.logMessage(level.splice, null, message.splice, cause.splice) http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/31149ae6/log4j-api-scala_2.11/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala ---------------------------------------------------------------------- diff --git a/log4j-api-scala_2.11/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala b/log4j-api-scala_2.11/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala index aea687a..0979cf2 100644 --- a/log4j-api-scala_2.11/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala +++ b/log4j-api-scala_2.11/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala @@ -16,9 +16,9 @@ */ package org.apache.logging.log4j.scala -import org.apache.logging.log4j.message.{SimpleMessage, Message, ParameterizedMessageFactory} +import org.apache.logging.log4j.message.{Message, ParameterizedMessage, ParameterizedMessageFactory} import org.apache.logging.log4j.spi.ExtendedLogger -import org.apache.logging.log4j.{MarkerManager, Level, Marker} +import org.apache.logging.log4j.{Level, Marker, MarkerManager} import org.junit.runner.RunWith import org.mockito.Matchers.{any, anyString, eq => eqv} import org.mockito.Mockito._ @@ -30,7 +30,7 @@ import org.scalatest.{FunSuite, Matchers} class LoggerTest extends FunSuite with Matchers with MockitoSugar { val stringMsg = "string msg" - val msg = new SimpleMessage("simple msg") + val msg = new ParameterizedMessage("msg {}", 17) val cause = new RuntimeException("cause") val marker = MarkerManager.getMarker("marker")
