Location-aware logging and more
* Implement location-aware logging by overriding all logging
methods and calling the delegate explicitly with the FQCN.
* Add Kotlin lambda versions of all methods with Supplier
params.
* Fix up trace extension, now called runInTrace. Location-aware
logging still does not work for this extension -- see comments
in code.
diff --git a/log4j-api-kotlin-sample/src/main/kotlin/org/apache/logging/log4j/kotlin/sample/LoggingApp.kt b/log4j-api-kotlin-sample/src/main/kotlin/org/apache/logging/log4j/kotlin/sample/LoggingApp.kt
index 43890ea..9a72427 100644
--- a/log4j-api-kotlin-sample/src/main/kotlin/org/apache/logging/log4j/kotlin/sample/LoggingApp.kt
+++ b/log4j-api-kotlin-sample/src/main/kotlin/org/apache/logging/log4j/kotlin/sample/LoggingApp.kt
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.kotlin.sample
-import org.apache.logging.log4j.Level
import org.apache.logging.log4j.kotlin.logger
import java.util.*
@@ -27,25 +26,24 @@
fun main(args: Array<String>) {
val s1 = "foo"
val s2 = "bar"
- val t = RuntimeException("error")
log.info { "Hello, world: $s1 $s2" }
log.trace("Regular trace")
- log.trace {
+ log.runInTrace {
log.info("Inside trace extension!")
}
- log.trace({ "Trace extension with entry message." }) {
- log.info("Inside trace extension with supplier!")
+ log.runInTrace(log.traceEntry({ "param1" }, { "param2" })) {
+ log.info("Inside trace extension with params suppliers!")
}
- fun getKey(): Int = log.trace {
+ fun getKey(): Int = log.runInTrace {
Random().nextInt(10)
}
- fun getKeyError(): Int = log.trace {
+ fun getKeyError(): Int = log.runInTrace {
throw Exception("Oops!")
}
@@ -53,13 +51,7 @@
try {
log.info { "Key was ${getKeyError()}" }
} catch(e: Exception) {
- Unit
+ log.info { "Key threw ${e.message}" }
}
-
- log.throwing(t)
- log.throwing(Level.INFO, t)
-
- log.catching(t)
-
}
}
diff --git a/log4j-api-kotlin-sample/src/main/kotlin/org/apache/logging/log4j/kotlin/sample/LoggingAppMixin.kt b/log4j-api-kotlin-sample/src/main/kotlin/org/apache/logging/log4j/kotlin/sample/LoggingAppMixin.kt
index da3de0a..4d96e44 100644
--- a/log4j-api-kotlin-sample/src/main/kotlin/org/apache/logging/log4j/kotlin/sample/LoggingAppMixin.kt
+++ b/log4j-api-kotlin-sample/src/main/kotlin/org/apache/logging/log4j/kotlin/sample/LoggingAppMixin.kt
@@ -16,9 +16,7 @@
*/
package org.apache.logging.log4j.kotlin.sample
-import org.apache.logging.log4j.Level
import org.apache.logging.log4j.kotlin.Logging
-import org.apache.logging.log4j.kotlin.logger
import java.util.*
object LoggingAppMixin: Logging {
@@ -26,25 +24,24 @@
fun main(args: Array<String>) {
val s1 = "foo"
val s2 = "bar"
- val t = RuntimeException("error")
logger.info { "Hello, world: $s1 $s2" }
logger.trace("Regular trace")
- logger.trace {
+ logger.runInTrace {
logger.info("Inside trace extension!")
}
- logger.trace({ "Trace extension with entry message." }) {
- logger.info("Inside trace extension with supplier!")
+ logger.runInTrace(logger.traceEntry({ "param1" }, { "param2" })) {
+ logger.info("Inside trace extension with params suppliers!")
}
- fun getKey(): Int = logger.trace {
+ fun getKey(): Int = logger.runInTrace {
Random().nextInt(10)
}
- fun getKeyError(): Int = logger.trace {
+ fun getKeyError(): Int = logger.runInTrace {
throw Exception("Oops!")
}
@@ -52,12 +49,7 @@
try {
logger.info { "Key was ${getKeyError()}" }
} catch(e: Exception) {
- Unit
+ logger.info { "Key threw ${e.message}" }
}
-
- logger.throwing(t)
- logger.throwing(Level.INFO, t)
-
- logger.catching(t)
}
}
diff --git a/log4j-api-kotlin/src/main/kotlin/org/apache/logging/log4j/kotlin/Logger.kt b/log4j-api-kotlin/src/main/kotlin/org/apache/logging/log4j/kotlin/Logger.kt
index 2304967..8eb0a6a 100644
--- a/log4j-api-kotlin/src/main/kotlin/org/apache/logging/log4j/kotlin/Logger.kt
+++ b/log4j-api-kotlin/src/main/kotlin/org/apache/logging/log4j/kotlin/Logger.kt
@@ -20,6 +20,8 @@
import org.apache.logging.log4j.LogManager
import org.apache.logging.log4j.Logger
import org.apache.logging.log4j.Marker
+import org.apache.logging.log4j.message.EntryMessage
+import org.apache.logging.log4j.message.Message
import org.apache.logging.log4j.spi.ExtendedLogger
import org.apache.logging.log4j.util.MessageSupplier
import org.apache.logging.log4j.util.Supplier
@@ -51,162 +53,1644 @@
* log.error(exc) { "Unexpected exception evaluating $whatever." }
* ```
*
- * One known limitation of the Kotlin logging API is that location aware logging does not work
+ * The adapter also provides a `runInTrace` utility that avoids having to call traceEnter and traceExit and
+ * catch manually. Rather, simply call the `trace` method, passing in an [EntryMessage] and the block to execute
+ * within trace enter/exit/catch calls. Location-awareness is currently broken for trace logging with this
+ * method as the ExtendedLogger does not expose the enter/exit/catch calls with the FQCN parameter.
+ *
+ * Lastly, while Kotlin's delegation capabilities would normally allow this implementation to be
+ * significantly less verbose by automatically delegating most methods to the ExtendedLogger delegate, this
+ * would break location-awareness, as the ExtendedLogger delegate assumes its own FQCN is the root of the
+ * logging stack.
*/
-@Suppress("NOTHING_TO_INLINE", "OVERRIDE_BY_INLINE", "UNUSED")
-class FunctionalLogger(val log: ExtendedLogger): Logger by log {
+@Suppress("UNUSED", "MemberVisibilityCanBePrivate")
+class FunctionalLogger(private val log: ExtendedLogger): Logger by log {
companion object {
val FQCN: String = FunctionalLogger::class.java.name
- inline fun <T: Any?> (() -> T).asLog4jSupplier(): Supplier<T> = Supplier { invoke() }
+ fun <T: Any?> (() -> T).asLog4jSupplier(): Supplier<T> = Supplier { invoke() }
+ fun <T: Any?> (Array<out () -> T>).asLog4jSuppliers(): Array<Supplier<T>> = map { it.asLog4jSupplier() }.toTypedArray()
}
- inline fun trace(t: Throwable, crossinline supplier: () -> Any?) {
+ override fun log(level: Level, marker: Marker?, msg: Message?) {
+ log.logIfEnabled(FQCN, level, marker, msg, null)
+ }
+
+ override fun log(level: Level, marker: Marker?, msg: Message?, t: Throwable?) {
+ log.logIfEnabled(FQCN, level, marker, msg, t)
+ }
+
+ override fun log(level: Level, marker: Marker?, msg: CharSequence?) {
+ log.logIfEnabled(FQCN, level, marker, msg, null)
+ }
+
+ override fun log(level: Level, marker: Marker?, msg: CharSequence?, t: Throwable?) {
+ log.logIfEnabled(FQCN, level, marker, msg, t)
+ }
+
+ override fun log(level: Level, marker: Marker?, msg: Any?) {
+ log.logIfEnabled(FQCN, level, marker, msg, null)
+ }
+
+ override fun log(level: Level, marker: Marker?, msg: String?) {
+ log.logIfEnabled(FQCN, level, marker, msg, null as Throwable?)
+ }
+
+ override fun log(level: Level, marker: Marker?, msg: String?, vararg params: Any?) {
+ log.logIfEnabled(FQCN, level, marker, msg, *params)
+ }
+
+ override fun log(level: Level, marker: Marker?, msg: String?, t: Throwable?) {
+ log.logIfEnabled(FQCN, level, marker, msg, t)
+ }
+
+ override fun log(level: Level, msg: Message?) {
+ log.logIfEnabled(FQCN, level, null, msg, null)
+ }
+
+ override fun log(level: Level, msg: Message?, t: Throwable?) {
+ log.logIfEnabled(FQCN, level, null, msg, t)
+ }
+
+ override fun log(level: Level, msg: CharSequence?) {
+ log.logIfEnabled(FQCN, level, null, msg, null)
+ }
+
+ override fun log(level: Level, msg: CharSequence?, t: Throwable?) {
+ log.logIfEnabled(FQCN, level, null, msg, t)
+ }
+
+ override fun log(level: Level, msg: Any?) {
+ log.logIfEnabled(FQCN, level, null, msg, null)
+ }
+
+ override fun log(level: Level, msg: Any?, t: Throwable?) {
+ log.logIfEnabled(FQCN, level, null, msg, t)
+ }
+
+ override fun log(level: Level, msg: String?) {
+ log.logIfEnabled(FQCN, level, null, msg, null as Throwable?)
+ }
+
+ override fun log(level: Level, msg: String?, vararg params: Any?) {
+ log.logIfEnabled(FQCN, level, null, msg, *params)
+ }
+
+ override fun log(level: Level, msg: String?, t: Throwable?) {
+ log.logIfEnabled(FQCN, level, null, msg, t)
+ }
+
+ override fun log(level: Level, msgSupplier: Supplier<*>?) {
+ log.logIfEnabled(FQCN, level, null, msgSupplier, null)
+ }
+
+ fun log(level: Level, supplier: () -> Any?) {
+ log.logIfEnabled(FQCN, level, null, supplier.asLog4jSupplier(), null)
+ }
+
+ override fun log(level: Level, msgSupplier: Supplier<*>?, t: Throwable?) {
+ log.logIfEnabled(FQCN, level, null, msgSupplier, t)
+ }
+
+ fun log(level: Level, t: Throwable, supplier: () -> Any?) {
+ log.logIfEnabled(FQCN, level, null, supplier.asLog4jSupplier(), t)
+ }
+
+ override fun log(level: Level, marker: Marker?, msgSupplier: Supplier<*>?) {
+ log.logIfEnabled(FQCN, level, marker, msgSupplier, null)
+ }
+
+ fun log(level: Level, marker: Marker?, supplier: () -> Any?) {
+ log.logIfEnabled(FQCN, level, marker, supplier.asLog4jSupplier(), null)
+ }
+
+ override fun log(level: Level, marker: Marker?, msg: String?, vararg paramSuppliers: Supplier<*>?) {
+ log.logIfEnabled(FQCN, level, marker, msg, *paramSuppliers)
+ }
+
+ fun log(level: Level, marker: Marker?, msg: String?, vararg paramSuppliers: () -> Any?) {
+ log.logIfEnabled(FQCN, level, marker, msg, *paramSuppliers.asLog4jSuppliers())
+ }
+
+ override fun log(level: Level, marker: Marker?, msgSupplier: Supplier<*>?, t: Throwable?) {
+ log.logIfEnabled(FQCN, level, marker, msgSupplier, t)
+ }
+
+ fun log(level: Level, marker: Marker?, t: Throwable?, supplier: () -> Any?) {
+ log.logIfEnabled(FQCN, level, marker, supplier.asLog4jSupplier(), t)
+ }
+
+ override fun log(level: Level, msg: String?, vararg paramSuppliers: Supplier<*>?) {
+ log.logIfEnabled(FQCN, level, null, msg, *paramSuppliers)
+ }
+
+ fun log(level: Level, msg: String?, vararg paramSuppliers: () -> Any?) {
+ log.logIfEnabled(FQCN, level, null, msg, *paramSuppliers.asLog4jSuppliers())
+ }
+
+ @Deprecated("Use lambda methods.", ReplaceWith("log.trace(Marker, () -> Any?>)"))
+ override fun log(level: Level, marker: Marker?, msgSupplier: MessageSupplier?) {
+ log.logIfEnabled(FQCN, level, marker, msgSupplier, null)
+ }
+
+ @Deprecated("Use lambda methods.", ReplaceWith("log.trace(Marker, Throwable, () -> Any?>)"))
+ override fun log(level: Level, marker: Marker?, msgSupplier: MessageSupplier?, t: Throwable?) {
+ log.logIfEnabled(FQCN, level, marker, msgSupplier, t)
+ }
+
+ @Deprecated("Use lambda methods.", ReplaceWith("log.trace(() -> Any?>)"))
+ override fun log(level: Level, messageSupplier: MessageSupplier?) {
+ log.logIfEnabled(FQCN, level, null, messageSupplier, null)
+ }
+
+ @Deprecated("Use lambda methods.", ReplaceWith("log.trace(Throwable, () -> Any?>)"))
+ override fun log(level: Level, msgSupplier: MessageSupplier?, t: Throwable?) {
+ log.logIfEnabled(FQCN, level, null, msgSupplier, t)
+ }
+
+ override fun log(level: Level, marker: Marker?, msg: String?, p0: Any?) {
+ log.logIfEnabled(FQCN, level, marker, msg, p0)
+ }
+
+ override fun log(level: Level, marker: Marker?, msg: String?, p0: Any?, p1: Any?) {
+ log.logIfEnabled(FQCN, level, marker, msg, p0, p1)
+ }
+
+ override fun log(level: Level, marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?) {
+ log.logIfEnabled(FQCN, level, marker, msg, p0, p2, p2)
+ }
+
+ override fun log(level: Level, marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?) {
+ log.logIfEnabled(FQCN, level, marker, msg, p0, p1, p2, p3)
+ }
+
+ override fun log(level: Level, marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?) {
+ log.logIfEnabled(FQCN, level, marker, msg, p0, p1, p2, p3, p4)
+ }
+
+ override fun log(level: Level, marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?) {
+ log.logIfEnabled(FQCN, level, marker, msg, p0, p1, p2, p3, p4, p5)
+ }
+
+ override fun log(level: Level, marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?) {
+ log.logIfEnabled(FQCN, level, marker, msg, p0, p1, p2, p3, p4, p5, p6)
+ }
+
+ override fun log(level: Level, marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?) {
+ log.logIfEnabled(FQCN, level, marker, msg, p0, p1, p2, p3, p4, p5, p6, p7)
+ }
+
+ override fun log(level: Level, marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?, p8: Any?) {
+ log.logIfEnabled(FQCN, level, marker, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8)
+ }
+
+ override fun log(level: Level, marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?, p8: Any?, p9: Any?) {
+ log.logIfEnabled(FQCN, level, marker, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)
+ }
+
+ override fun log(level: Level, marker: Marker?, msg: Any?, t: Throwable?) {
+ log.logIfEnabled(FQCN, level, marker, msg, t)
+ }
+
+ override fun log(level: Level, msg: String?, p0: Any?) {
+ log.logIfEnabled(FQCN, level, null, msg, p0)
+ }
+
+ override fun log(level: Level, msg: String?, p0: Any?, p1: Any?) {
+ log.logIfEnabled(FQCN, level, null, msg, p0, p1)
+ }
+
+ override fun log(level: Level, msg: String?, p0: Any?, p1: Any?, p2: Any?) {
+ log.logIfEnabled(FQCN, level, null, msg, p0, p1, p2)
+ }
+
+ override fun log(level: Level, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?) {
+ log.logIfEnabled(FQCN, level, null, msg, p0, p1, p2, p3)
+ }
+
+ override fun log(level: Level, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?) {
+ log.logIfEnabled(FQCN, level, null, msg, p0, p1, p2, p3, p4)
+ }
+
+ override fun log(level: Level, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?) {
+ log.logIfEnabled(FQCN, level, null, msg, p0, p1, p2, p3, p4, p5)
+ }
+
+ override fun log(level: Level, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?) {
+ log.logIfEnabled(FQCN, level, null, msg, p0, p1, p2, p3, p4, p5, p6)
+ }
+
+ override fun log(level: Level, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?) {
+ log.logIfEnabled(FQCN, level, null, msg, p0, p1, p2, p3, p4, p5, p6, p7)
+ }
+
+ override fun log(level: Level, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?, p8: Any?) {
+ log.logIfEnabled(FQCN, level, null, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8)
+ }
+
+ override fun log(level: Level, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?, p8: Any?, p9: Any?) {
+ log.logIfEnabled(FQCN, level, null, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)
+ }
+
+ override fun trace(marker: Marker?, msg: Message?) {
+ log.logIfEnabled(FQCN, Level.TRACE, marker, msg, null)
+ }
+
+ override fun trace(marker: Marker?, msg: Message?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.TRACE, marker, msg, t)
+ }
+
+ override fun trace(marker: Marker?, msg: CharSequence?) {
+ log.logIfEnabled(FQCN, Level.TRACE, marker, msg, null)
+ }
+
+ override fun trace(marker: Marker?, msg: CharSequence?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.TRACE, marker, msg, t)
+ }
+
+ override fun trace(marker: Marker?, msg: Any?) {
+ log.logIfEnabled(FQCN, Level.TRACE, marker, msg, null)
+ }
+
+ override fun trace(marker: Marker?, msg: String?) {
+ log.logIfEnabled(FQCN, Level.TRACE, marker, msg, null as Throwable?)
+ }
+
+ override fun trace(marker: Marker?, msg: String?, vararg params: Any?) {
+ log.logIfEnabled(FQCN, Level.TRACE, marker, msg, *params)
+ }
+
+ override fun trace(marker: Marker?, msg: String?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.TRACE, marker, msg, t)
+ }
+
+ override fun trace(msg: Message?) {
+ log.logIfEnabled(FQCN, Level.TRACE, null, msg, null)
+ }
+
+ override fun trace(msg: Message?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.TRACE, null, msg, t)
+ }
+
+ override fun trace(msg: CharSequence?) {
+ log.logIfEnabled(FQCN, Level.TRACE, null, msg, null)
+ }
+
+ override fun trace(msg: CharSequence?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.TRACE, null, msg, t)
+ }
+
+ override fun trace(msg: Any?) {
+ log.logIfEnabled(FQCN, Level.TRACE, null, msg, null)
+ }
+
+ override fun trace(msg: Any?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.TRACE, null, msg, t)
+ }
+
+ override fun trace(msg: String?) {
+ log.logIfEnabled(FQCN, Level.TRACE, null, msg, null as Throwable?)
+ }
+
+ override fun trace(msg: String?, vararg params: Any?) {
+ log.logIfEnabled(FQCN, Level.TRACE, null, msg, *params)
+ }
+
+ override fun trace(msg: String?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.TRACE, null, msg, t)
+ }
+
+ override fun trace(msgSupplier: Supplier<*>?) {
+ log.logIfEnabled(FQCN, Level.TRACE, null, msgSupplier, null)
+ }
+
+ fun trace(supplier: () -> Any?) {
+ log.logIfEnabled(FQCN, Level.TRACE, null, supplier.asLog4jSupplier(), null)
+ }
+
+ override fun trace(msgSupplier: Supplier<*>?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.TRACE, null, msgSupplier, t)
+ }
+
+ fun trace(t: Throwable, supplier: () -> Any?) {
log.logIfEnabled(FQCN, Level.TRACE, null, supplier.asLog4jSupplier(), t)
}
- inline fun trace(marker: Marker?, crossinline supplier: () -> Any?) {
+ override fun trace(marker: Marker?, msgSupplier: Supplier<*>?) {
+ log.logIfEnabled(FQCN, Level.TRACE, marker, msgSupplier, null)
+ }
+
+ fun trace(marker: Marker?, supplier: () -> Any?) {
log.logIfEnabled(FQCN, Level.TRACE, marker, supplier.asLog4jSupplier(), null)
}
- inline fun trace(marker: Marker?, t: Throwable?, crossinline supplier: () -> Any?) {
+ override fun trace(marker: Marker?, msg: String?, vararg paramSuppliers: Supplier<*>?) {
+ log.logIfEnabled(FQCN, Level.TRACE, marker, msg, *paramSuppliers)
+ }
+
+ fun trace(marker: Marker?, msg: String?, vararg paramSuppliers: () -> Any?) {
+ log.logIfEnabled(FQCN, Level.TRACE, marker, msg, *paramSuppliers.asLog4jSuppliers())
+ }
+
+ override fun trace(marker: Marker?, msgSupplier: Supplier<*>?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.TRACE, marker, msgSupplier, t)
+ }
+
+ fun trace(marker: Marker?, t: Throwable?, supplier: () -> Any?) {
log.logIfEnabled(FQCN, Level.TRACE, marker, supplier.asLog4jSupplier(), t)
}
- inline fun debug(crossinline supplier: () -> Any?) {
+ override fun trace(msg: String?, vararg paramSuppliers: Supplier<*>?) {
+ log.logIfEnabled(FQCN, Level.TRACE, null, msg, *paramSuppliers)
+ }
+
+ fun trace(msg: String?, vararg paramSuppliers: () -> Any?) {
+ log.logIfEnabled(FQCN, Level.TRACE, null, msg, *paramSuppliers.asLog4jSuppliers())
+ }
+
+ @Deprecated("Use lambda methods.", ReplaceWith("log.trace(Marker, () -> Any?>)"))
+ override fun trace(marker: Marker?, msgSupplier: MessageSupplier?) {
+ log.logIfEnabled(FQCN, Level.TRACE, marker, msgSupplier, null)
+ }
+
+ @Deprecated("Use lambda methods.", ReplaceWith("log.trace(Marker, Throwable, () -> Any?>)"))
+ override fun trace(marker: Marker?, msgSupplier: MessageSupplier?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.TRACE, marker, msgSupplier, t)
+ }
+
+ @Deprecated("Use lambda methods.", ReplaceWith("log.trace(() -> Any?>)"))
+ override fun trace(messageSupplier: MessageSupplier?) {
+ log.logIfEnabled(FQCN, Level.TRACE, null, messageSupplier, null)
+ }
+
+ @Deprecated("Use lambda methods.", ReplaceWith("log.trace(Throwable, () -> Any?>)"))
+ override fun trace(msgSupplier: MessageSupplier?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.TRACE, null, msgSupplier, t)
+ }
+
+ override fun trace(marker: Marker?, msg: String?, p0: Any?) {
+ log.logIfEnabled(FQCN, Level.TRACE, marker, msg, p0)
+ }
+
+ override fun trace(marker: Marker?, msg: String?, p0: Any?, p1: Any?) {
+ log.logIfEnabled(FQCN, Level.TRACE, marker, msg, p0, p1)
+ }
+
+ override fun trace(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?) {
+ log.logIfEnabled(FQCN, Level.TRACE, marker, msg, p0, p2, p2)
+ }
+
+ override fun trace(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?) {
+ log.logIfEnabled(FQCN, Level.TRACE, marker, msg, p0, p1, p2, p3)
+ }
+
+ override fun trace(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?) {
+ log.logIfEnabled(FQCN, Level.TRACE, marker, msg, p0, p1, p2, p3, p4)
+ }
+
+ override fun trace(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?) {
+ log.logIfEnabled(FQCN, Level.TRACE, marker, msg, p0, p1, p2, p3, p4, p5)
+ }
+
+ override fun trace(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?) {
+ log.logIfEnabled(FQCN, Level.TRACE, marker, msg, p0, p1, p2, p3, p4, p5, p6)
+ }
+
+ override fun trace(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?) {
+ log.logIfEnabled(FQCN, Level.TRACE, marker, msg, p0, p1, p2, p3, p4, p5, p6, p7)
+ }
+
+ override fun trace(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?, p8: Any?) {
+ log.logIfEnabled(FQCN, Level.TRACE, marker, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8)
+ }
+
+ override fun trace(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?, p8: Any?, p9: Any?) {
+ log.logIfEnabled(FQCN, Level.TRACE, marker, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)
+ }
+
+ override fun trace(marker: Marker?, msg: Any?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.TRACE, marker, msg, t)
+ }
+
+ override fun trace(msg: String?, p0: Any?) {
+ log.logIfEnabled(FQCN, Level.TRACE, null, msg, p0)
+ }
+
+ override fun trace(msg: String?, p0: Any?, p1: Any?) {
+ log.logIfEnabled(FQCN, Level.TRACE, null, msg, p0, p1)
+ }
+
+ override fun trace(msg: String?, p0: Any?, p1: Any?, p2: Any?) {
+ log.logIfEnabled(FQCN, Level.TRACE, null, msg, p0, p1, p2)
+ }
+
+ override fun trace(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?) {
+ log.logIfEnabled(FQCN, Level.TRACE, null, msg, p0, p1, p2, p3)
+ }
+
+ override fun trace(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?) {
+ log.logIfEnabled(FQCN, Level.TRACE, null, msg, p0, p1, p2, p3, p4)
+ }
+
+ override fun trace(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?) {
+ log.logIfEnabled(FQCN, Level.TRACE, null, msg, p0, p1, p2, p3, p4, p5)
+ }
+
+ override fun trace(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?) {
+ log.logIfEnabled(FQCN, Level.TRACE, null, msg, p0, p1, p2, p3, p4, p5, p6)
+ }
+
+ override fun trace(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?) {
+ log.logIfEnabled(FQCN, Level.TRACE, null, msg, p0, p1, p2, p3, p4, p5, p6, p7)
+ }
+
+ override fun trace(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?, p8: Any?) {
+ log.logIfEnabled(FQCN, Level.TRACE, null, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8)
+ }
+
+ override fun trace(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?, p8: Any?, p9: Any?) {
+ log.logIfEnabled(FQCN, Level.TRACE, null, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)
+ }
+
+ // TODO entry with fqcn is not part of the ExtendedLogger interface, location-awareness will be broken
+ override fun traceEntry(): EntryMessage {
+ return log.traceEntry()
+ }
+
+ // TODO entry with fqcn is not part of the ExtendedLogger interface, location-awareness will be broken
+ override fun traceEntry(format: String?, vararg params: Any?): EntryMessage {
+ return log.traceEntry(format, *params)
+ }
+
+ // TODO entry with fqcn is not part of the ExtendedLogger interface, location-awareness will be broken
+ override fun traceEntry(vararg paramSuppliers: Supplier<*>?): EntryMessage {
+ return log.traceEntry(*paramSuppliers)
+ }
+
+ fun traceEntry(vararg paramSuppliers: () -> Any?): EntryMessage {
+ return log.traceEntry(*paramSuppliers.asLog4jSuppliers())
+ }
+
+ // TODO entry with fqcn is not part of the ExtendedLogger interface, location-awareness will be broken
+ override fun traceEntry(format: String?, vararg paramSuppliers: Supplier<*>?): EntryMessage {
+ return log.traceEntry(format, *paramSuppliers)
+ }
+
+ fun traceEntry(format: String?, vararg paramSuppliers: () -> Any?): EntryMessage {
+ return log.traceEntry(format, *paramSuppliers.asLog4jSuppliers())
+ }
+
+ // TODO entry with fqcn is not part of the ExtendedLogger interface, location-awareness will be broken
+ override fun traceEntry(message: Message?): EntryMessage {
+ return log.traceEntry(message)
+ }
+
+ // TODO exit with fqcn is not part of the ExtendedLogger interface, location-awareness will be broken
+ override fun traceExit() {
+ log.traceExit()
+ }
+
+ // TODO exit with fqcn is not part of the ExtendedLogger interface, location-awareness will be broken
+ override fun <R : Any?> traceExit(format: String?, result: R): R {
+ return log.traceExit(format, result)
+ }
+
+ // TODO exit with fqcn is not part of the ExtendedLogger interface, location-awareness will be broken
+ override fun <R : Any?> traceExit(message: Message?, result: R): R {
+ return log.traceExit(message, result)
+ }
+
+ // TODO exit with fqcn is not part of the ExtendedLogger interface, location-awareness will be broken
+ override fun traceExit(message: EntryMessage?) {
+ log.traceExit(message)
+ }
+
+ // TODO exit with fqcn is not part of the ExtendedLogger interface, location-awareness will be broken
+ override fun <R : Any?> traceExit(result: R): R {
+ return log.traceExit(result)
+ }
+
+ // TODO exit with fqcn is not part of the ExtendedLogger interface, location-awareness will be broken
+ override fun <R : Any?> traceExit(message: EntryMessage?, result: R): R {
+ return log.traceExit(message, result)
+ }
+
+ fun <R : Any?> runInTrace(block: () -> R): R {
+ return runInTrace(traceEntry(), block)
+ }
+
+ fun <R : Any?> runInTrace(entryMessage: EntryMessage, block: () -> R): R {
+ return try {
+ val result = block()
+ when(result) {
+ Unit -> traceExit(entryMessage)
+ else -> traceExit(entryMessage, result)
+ }
+ result
+ } catch (e: Throwable) {
+ catching(e)
+ throw e
+ }
+ }
+
+ override fun debug(marker: Marker?, msg: Message?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, marker, msg, null)
+ }
+
+ override fun debug(marker: Marker?, msg: Message?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, marker, msg, t)
+ }
+
+ override fun debug(marker: Marker?, msg: CharSequence?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, marker, msg, null)
+ }
+
+ override fun debug(marker: Marker?, msg: CharSequence?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, marker, msg, t)
+ }
+
+ override fun debug(marker: Marker?, msg: Any?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, marker, msg, null)
+ }
+
+ override fun debug(marker: Marker?, msg: String?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, marker, msg, null as Throwable?)
+ }
+
+ override fun debug(marker: Marker?, msg: String?, vararg params: Any?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, marker, msg, *params)
+ }
+
+ override fun debug(marker: Marker?, msg: String?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, marker, msg, t)
+ }
+
+ override fun debug(msg: Message?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, null, msg, null)
+ }
+
+ override fun debug(msg: Message?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, null, msg, t)
+ }
+
+ override fun debug(msg: CharSequence?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, null, msg, null)
+ }
+
+ override fun debug(msg: CharSequence?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, null, msg, t)
+ }
+
+ override fun debug(msg: Any?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, null, msg, null)
+ }
+
+ override fun debug(msg: Any?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, null, msg, t)
+ }
+
+ override fun debug(msg: String?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, null, msg, null as Throwable?)
+ }
+
+ override fun debug(msg: String?, vararg params: Any?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, null, msg, *params)
+ }
+
+ override fun debug(msg: String?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, null, msg, t)
+ }
+
+ override fun debug(msgSupplier: Supplier<*>?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, null, msgSupplier, null)
+ }
+
+ fun debug(supplier: () -> Any?) {
log.logIfEnabled(FQCN, Level.DEBUG, null, supplier.asLog4jSupplier(), null)
}
- inline fun debug(t: Throwable, crossinline supplier: () -> Any?) {
+ override fun debug(msgSupplier: Supplier<*>?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, null, msgSupplier, t)
+ }
+
+ fun debug(t: Throwable, supplier: () -> Any?) {
log.logIfEnabled(FQCN, Level.DEBUG, null, supplier.asLog4jSupplier(), t)
}
- inline fun debug(marker: Marker?, crossinline supplier: () -> Any?) {
+ override fun debug(marker: Marker?, msgSupplier: Supplier<*>?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, marker, msgSupplier, null)
+ }
+
+ fun debug(marker: Marker?, supplier: () -> Any?) {
log.logIfEnabled(FQCN, Level.DEBUG, marker, supplier.asLog4jSupplier(), null)
}
- inline fun debug(marker: Marker?, t: Throwable?, crossinline supplier: () -> Any?) {
+ override fun debug(marker: Marker?, msg: String?, vararg paramSuppliers: Supplier<*>?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, marker, msg, *paramSuppliers)
+ }
+
+ fun debug(marker: Marker?, msg: String?, vararg paramSuppliers: () -> Any?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, marker, msg, *paramSuppliers.asLog4jSuppliers())
+ }
+
+ override fun debug(marker: Marker?, msgSupplier: Supplier<*>?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, marker, msgSupplier, t)
+ }
+
+ fun debug(marker: Marker?, t: Throwable?, supplier: () -> Any?) {
log.logIfEnabled(FQCN, Level.DEBUG, marker, supplier.asLog4jSupplier(), t)
}
- inline fun info(crossinline supplier: () -> Any?) {
+ override fun debug(msg: String?, vararg paramSuppliers: Supplier<*>?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, null, msg, *paramSuppliers)
+ }
+
+ fun debug(msg: String?, vararg paramSuppliers: () -> Any?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, null, msg, *paramSuppliers.asLog4jSuppliers())
+ }
+
+ @Deprecated("Use lambda methods.", ReplaceWith("log.debug(Marker, () -> Any?>)"))
+ override fun debug(marker: Marker?, msgSupplier: MessageSupplier?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, marker, msgSupplier, null)
+ }
+
+ @Deprecated("Use lambda methods.", ReplaceWith("log.debug(Marker, Throwable, () -> Any?>)"))
+ override fun debug(marker: Marker?, msgSupplier: MessageSupplier?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, marker, msgSupplier, t)
+ }
+
+ @Deprecated("Use lambda methods.", ReplaceWith("log.debug(() -> Any?>)"))
+ override fun debug(messageSupplier: MessageSupplier?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, null, messageSupplier, null)
+ }
+
+ @Deprecated("Use lambda methods.", ReplaceWith("log.debug(Throwable, () -> Any?>)"))
+ override fun debug(msgSupplier: MessageSupplier?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, null, msgSupplier, t)
+ }
+
+ override fun debug(marker: Marker?, msg: String?, p0: Any?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, marker, msg, p0)
+ }
+
+ override fun debug(marker: Marker?, msg: String?, p0: Any?, p1: Any?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, marker, msg, p0, p1)
+ }
+
+ override fun debug(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, marker, msg, p0, p2, p2)
+ }
+
+ override fun debug(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, marker, msg, p0, p1, p2, p3)
+ }
+
+ override fun debug(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, marker, msg, p0, p1, p2, p3, p4)
+ }
+
+ override fun debug(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, marker, msg, p0, p1, p2, p3, p4, p5)
+ }
+
+ override fun debug(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, marker, msg, p0, p1, p2, p3, p4, p5, p6)
+ }
+
+ override fun debug(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, marker, msg, p0, p1, p2, p3, p4, p5, p6, p7)
+ }
+
+ override fun debug(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?, p8: Any?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, marker, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8)
+ }
+
+ override fun debug(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?, p8: Any?, p9: Any?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, marker, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)
+ }
+
+ override fun debug(marker: Marker?, msg: Any?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, marker, msg, t)
+ }
+
+ override fun debug(msg: String?, p0: Any?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, null, msg, p0)
+ }
+
+ override fun debug(msg: String?, p0: Any?, p1: Any?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, null, msg, p0, p1)
+ }
+
+ override fun debug(msg: String?, p0: Any?, p1: Any?, p2: Any?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, null, msg, p0, p1, p2)
+ }
+
+ override fun debug(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, null, msg, p0, p1, p2, p3)
+ }
+
+ override fun debug(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, null, msg, p0, p1, p2, p3, p4)
+ }
+
+ override fun debug(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, null, msg, p0, p1, p2, p3, p4, p5)
+ }
+
+ override fun debug(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, null, msg, p0, p1, p2, p3, p4, p5, p6)
+ }
+
+ override fun debug(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, null, msg, p0, p1, p2, p3, p4, p5, p6, p7)
+ }
+
+ override fun debug(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?, p8: Any?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, null, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8)
+ }
+
+ override fun debug(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?, p8: Any?, p9: Any?) {
+ log.logIfEnabled(FQCN, Level.DEBUG, null, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)
+ }
+
+ override fun info(marker: Marker?, msg: Message?) {
+ log.logIfEnabled(FQCN, Level.INFO, marker, msg, null)
+ }
+
+ override fun info(marker: Marker?, msg: Message?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.INFO, marker, msg, t)
+ }
+
+ override fun info(marker: Marker?, msg: CharSequence?) {
+ log.logIfEnabled(FQCN, Level.INFO, marker, msg, null)
+ }
+
+ override fun info(marker: Marker?, msg: CharSequence?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.INFO, marker, msg, t)
+ }
+
+ override fun info(marker: Marker?, msg: Any?) {
+ log.logIfEnabled(FQCN, Level.INFO, marker, msg, null)
+ }
+
+ override fun info(marker: Marker?, msg: String?) {
+ log.logIfEnabled(FQCN, Level.INFO, marker, msg, null as Throwable?)
+ }
+
+ override fun info(marker: Marker?, msg: String?, vararg params: Any?) {
+ log.logIfEnabled(FQCN, Level.INFO, marker, msg, *params)
+ }
+
+ override fun info(marker: Marker?, msg: String?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.INFO, marker, msg, t)
+ }
+
+ override fun info(msg: Message?) {
+ log.logIfEnabled(FQCN, Level.INFO, null, msg, null)
+ }
+
+ override fun info(msg: Message?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.INFO, null, msg, t)
+ }
+
+ override fun info(msg: CharSequence?) {
+ log.logIfEnabled(FQCN, Level.INFO, null, msg, null)
+ }
+
+ override fun info(msg: CharSequence?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.INFO, null, msg, t)
+ }
+
+ override fun info(msg: Any?) {
+ log.logIfEnabled(FQCN, Level.INFO, null, msg, null)
+ }
+
+ override fun info(msg: Any?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.INFO, null, msg, t)
+ }
+
+ override fun info(msg: String?) {
+ log.logIfEnabled(FQCN, Level.INFO, null, msg, null as Throwable?)
+ }
+
+ override fun info(msg: String?, vararg params: Any?) {
+ log.logIfEnabled(FQCN, Level.INFO, null, msg, *params)
+ }
+
+ override fun info(msg: String?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.INFO, null, msg, t)
+ }
+
+ override fun info(msgSupplier: Supplier<*>?) {
+ log.logIfEnabled(FQCN, Level.INFO, null, msgSupplier, null)
+ }
+
+ fun info(supplier: () -> Any?) {
log.logIfEnabled(FQCN, Level.INFO, null, supplier.asLog4jSupplier(), null)
}
- inline fun info(t: Throwable, crossinline supplier: () -> Any?) {
+ override fun info(msgSupplier: Supplier<*>?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.INFO, null, msgSupplier, t)
+ }
+
+ fun info(t: Throwable, supplier: () -> Any?) {
log.logIfEnabled(FQCN, Level.INFO, null, supplier.asLog4jSupplier(), t)
}
- inline fun info(marker: Marker?, crossinline supplier: () -> Any?) {
+ override fun info(marker: Marker?, msgSupplier: Supplier<*>?) {
+ log.logIfEnabled(FQCN, Level.INFO, marker, msgSupplier, null)
+ }
+
+ fun info(marker: Marker?, supplier: () -> Any?) {
log.logIfEnabled(FQCN, Level.INFO, marker, supplier.asLog4jSupplier(), null)
}
- inline fun info(marker: Marker?, t: Throwable?, crossinline supplier: () -> Any?) {
+ override fun info(marker: Marker?, msg: String?, vararg paramSuppliers: Supplier<*>?) {
+ log.logIfEnabled(FQCN, Level.INFO, marker, msg, *paramSuppliers)
+ }
+
+ fun info(marker: Marker?, msg: String?, vararg paramSuppliers: () -> Any?) {
+ log.logIfEnabled(FQCN, Level.INFO, marker, msg, *paramSuppliers.asLog4jSuppliers())
+ }
+
+ override fun info(marker: Marker?, msgSupplier: Supplier<*>?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.INFO, marker, msgSupplier, t)
+ }
+
+ fun info(marker: Marker?, t: Throwable?, supplier: () -> Any?) {
log.logIfEnabled(FQCN, Level.INFO, marker, supplier.asLog4jSupplier(), t)
}
- inline fun warn(crossinline supplier: () -> Any?) {
+ override fun info(msg: String?, vararg paramSuppliers: Supplier<*>?) {
+ log.logIfEnabled(FQCN, Level.INFO, null, msg, *paramSuppliers)
+ }
+
+ fun info(msg: String?, vararg paramSuppliers: () -> Any?) {
+ log.logIfEnabled(FQCN, Level.INFO, null, msg, *paramSuppliers.asLog4jSuppliers())
+ }
+
+ @Deprecated("Use lambda methods.", ReplaceWith("log.info(Marker, () -> Any?>)"))
+ override fun info(marker: Marker?, msgSupplier: MessageSupplier?) {
+ log.logIfEnabled(FQCN, Level.INFO, marker, msgSupplier, null)
+ }
+
+ @Deprecated("Use lambda methods.", ReplaceWith("log.info(Marker, Throwable, () -> Any?>)"))
+ override fun info(marker: Marker?, msgSupplier: MessageSupplier?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.INFO, marker, msgSupplier, t)
+ }
+
+ @Deprecated("Use lambda methods.", ReplaceWith("log.info(() -> Any?>)"))
+ override fun info(messageSupplier: MessageSupplier?) {
+ log.logIfEnabled(FQCN, Level.INFO, null, messageSupplier, null)
+ }
+
+ @Deprecated("Use lambda methods.", ReplaceWith("log.info(Throwable, () -> Any?>)"))
+ override fun info(msgSupplier: MessageSupplier?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.INFO, null, msgSupplier, t)
+ }
+
+ override fun info(marker: Marker?, msg: String?, p0: Any?) {
+ log.logIfEnabled(FQCN, Level.INFO, marker, msg, p0)
+ }
+
+ override fun info(marker: Marker?, msg: String?, p0: Any?, p1: Any?) {
+ log.logIfEnabled(FQCN, Level.INFO, marker, msg, p0, p1)
+ }
+
+ override fun info(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?) {
+ log.logIfEnabled(FQCN, Level.INFO, marker, msg, p0, p2, p2)
+ }
+
+ override fun info(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?) {
+ log.logIfEnabled(FQCN, Level.INFO, marker, msg, p0, p1, p2, p3)
+ }
+
+ override fun info(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?) {
+ log.logIfEnabled(FQCN, Level.INFO, marker, msg, p0, p1, p2, p3, p4)
+ }
+
+ override fun info(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?) {
+ log.logIfEnabled(FQCN, Level.INFO, marker, msg, p0, p1, p2, p3, p4, p5)
+ }
+
+ override fun info(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?) {
+ log.logIfEnabled(FQCN, Level.INFO, marker, msg, p0, p1, p2, p3, p4, p5, p6)
+ }
+
+ override fun info(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?) {
+ log.logIfEnabled(FQCN, Level.INFO, marker, msg, p0, p1, p2, p3, p4, p5, p6, p7)
+ }
+
+ override fun info(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?, p8: Any?) {
+ log.logIfEnabled(FQCN, Level.INFO, marker, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8)
+ }
+
+ override fun info(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?, p8: Any?, p9: Any?) {
+ log.logIfEnabled(FQCN, Level.INFO, marker, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)
+ }
+
+ override fun info(marker: Marker?, msg: Any?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.INFO, marker, msg, t)
+ }
+
+ override fun info(msg: String?, p0: Any?) {
+ log.logIfEnabled(FQCN, Level.INFO, null, msg, p0)
+ }
+
+ override fun info(msg: String?, p0: Any?, p1: Any?) {
+ log.logIfEnabled(FQCN, Level.INFO, null, msg, p0, p1)
+ }
+
+ override fun info(msg: String?, p0: Any?, p1: Any?, p2: Any?) {
+ log.logIfEnabled(FQCN, Level.INFO, null, msg, p0, p1, p2)
+ }
+
+ override fun info(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?) {
+ log.logIfEnabled(FQCN, Level.INFO, null, msg, p0, p1, p2, p3)
+ }
+
+ override fun info(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?) {
+ log.logIfEnabled(FQCN, Level.INFO, null, msg, p0, p1, p2, p3, p4)
+ }
+
+ override fun info(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?) {
+ log.logIfEnabled(FQCN, Level.INFO, null, msg, p0, p1, p2, p3, p4, p5)
+ }
+
+ override fun info(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?) {
+ log.logIfEnabled(FQCN, Level.INFO, null, msg, p0, p1, p2, p3, p4, p5, p6)
+ }
+
+ override fun info(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?) {
+ log.logIfEnabled(FQCN, Level.INFO, null, msg, p0, p1, p2, p3, p4, p5, p6, p7)
+ }
+
+ override fun info(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?, p8: Any?) {
+ log.logIfEnabled(FQCN, Level.INFO, null, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8)
+ }
+
+ override fun info(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?, p8: Any?, p9: Any?) {
+ log.logIfEnabled(FQCN, Level.INFO, null, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)
+ }
+
+ override fun warn(marker: Marker?, msg: Message?) {
+ log.logIfEnabled(FQCN, Level.WARN, marker, msg, null)
+ }
+
+ override fun warn(marker: Marker?, msg: Message?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.WARN, marker, msg, t)
+ }
+
+ override fun warn(marker: Marker?, msg: CharSequence?) {
+ log.logIfEnabled(FQCN, Level.WARN, marker, msg, null)
+ }
+
+ override fun warn(marker: Marker?, msg: CharSequence?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.WARN, marker, msg, t)
+ }
+
+ override fun warn(marker: Marker?, msg: Any?) {
+ log.logIfEnabled(FQCN, Level.WARN, marker, msg, null)
+ }
+
+ override fun warn(marker: Marker?, msg: String?) {
+ log.logIfEnabled(FQCN, Level.WARN, marker, msg, null as Throwable?)
+ }
+
+ override fun warn(marker: Marker?, msg: String?, vararg params: Any?) {
+ log.logIfEnabled(FQCN, Level.WARN, marker, msg, *params)
+ }
+
+ override fun warn(marker: Marker?, msg: String?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.WARN, marker, msg, t)
+ }
+
+ override fun warn(msg: Message?) {
+ log.logIfEnabled(FQCN, Level.WARN, null, msg, null)
+ }
+
+ override fun warn(msg: Message?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.WARN, null, msg, t)
+ }
+
+ override fun warn(msg: CharSequence?) {
+ log.logIfEnabled(FQCN, Level.WARN, null, msg, null)
+ }
+
+ override fun warn(msg: CharSequence?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.WARN, null, msg, t)
+ }
+
+ override fun warn(msg: Any?) {
+ log.logIfEnabled(FQCN, Level.WARN, null, msg, null)
+ }
+
+ override fun warn(msg: Any?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.WARN, null, msg, t)
+ }
+
+ override fun warn(msg: String?) {
+ log.logIfEnabled(FQCN, Level.WARN, null, msg, null as Throwable?)
+ }
+
+ override fun warn(msg: String?, vararg params: Any?) {
+ log.logIfEnabled(FQCN, Level.WARN, null, msg, *params)
+ }
+
+ override fun warn(msg: String?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.WARN, null, msg, t)
+ }
+
+ override fun warn(msgSupplier: Supplier<*>?) {
+ log.logIfEnabled(FQCN, Level.WARN, null, msgSupplier, null)
+ }
+
+ fun warn(supplier: () -> Any?) {
log.logIfEnabled(FQCN, Level.WARN, null, supplier.asLog4jSupplier(), null)
}
- inline fun warn(t: Throwable, crossinline supplier: () -> Any?) {
+ override fun warn(msgSupplier: Supplier<*>?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.WARN, null, msgSupplier, t)
+ }
+
+ fun warn(t: Throwable, supplier: () -> Any?) {
log.logIfEnabled(FQCN, Level.WARN, null, supplier.asLog4jSupplier(), t)
}
- inline fun warn(marker: Marker?, crossinline supplier: () -> Any?) {
+ override fun warn(marker: Marker?, msgSupplier: Supplier<*>?) {
+ log.logIfEnabled(FQCN, Level.WARN, marker, msgSupplier, null)
+ }
+
+ fun warn(marker: Marker?, supplier: () -> Any?) {
log.logIfEnabled(FQCN, Level.WARN, marker, supplier.asLog4jSupplier(), null)
}
- inline fun warn(marker: Marker?, t: Throwable?, crossinline supplier: () -> Any?) {
+ override fun warn(marker: Marker?, msg: String?, vararg paramSuppliers: Supplier<*>?) {
+ log.logIfEnabled(FQCN, Level.WARN, marker, msg, *paramSuppliers)
+ }
+
+ fun warn(marker: Marker?, msg: String?, vararg paramSuppliers: () -> Any?) {
+ log.logIfEnabled(FQCN, Level.WARN, marker, msg, *paramSuppliers.asLog4jSuppliers())
+ }
+
+ override fun warn(marker: Marker?, msgSupplier: Supplier<*>?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.WARN, marker, msgSupplier, t)
+ }
+
+ fun warn(marker: Marker?, t: Throwable?, supplier: () -> Any?) {
log.logIfEnabled(FQCN, Level.WARN, marker, supplier.asLog4jSupplier(), t)
}
- inline fun error(crossinline supplier: () -> Any?) {
+ override fun warn(msg: String?, vararg paramSuppliers: Supplier<*>?) {
+ log.logIfEnabled(FQCN, Level.WARN, null, msg, *paramSuppliers)
+ }
+
+ fun warn(msg: String?, vararg paramSuppliers: () -> Any?) {
+ log.logIfEnabled(FQCN, Level.WARN, null, msg, *paramSuppliers.asLog4jSuppliers())
+ }
+
+ @Deprecated("Use lambda methods.", ReplaceWith("log.warn(Marker, () -> Any?>)"))
+ override fun warn(marker: Marker?, msgSupplier: MessageSupplier?) {
+ log.logIfEnabled(FQCN, Level.WARN, marker, msgSupplier, null)
+ }
+
+ @Deprecated("Use lambda methods.", ReplaceWith("log.warn(Marker, Throwable, () -> Any?>)"))
+ override fun warn(marker: Marker?, msgSupplier: MessageSupplier?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.WARN, marker, msgSupplier, t)
+ }
+
+ @Deprecated("Use lambda methods.", ReplaceWith("log.warn(() -> Any?>)"))
+ override fun warn(messageSupplier: MessageSupplier?) {
+ log.logIfEnabled(FQCN, Level.WARN, null, messageSupplier, null)
+ }
+
+ @Deprecated("Use lambda methods.", ReplaceWith("log.warn(Throwable, () -> Any?>)"))
+ override fun warn(msgSupplier: MessageSupplier?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.WARN, null, msgSupplier, t)
+ }
+
+ override fun warn(marker: Marker?, msg: String?, p0: Any?) {
+ log.logIfEnabled(FQCN, Level.WARN, marker, msg, p0)
+ }
+
+ override fun warn(marker: Marker?, msg: String?, p0: Any?, p1: Any?) {
+ log.logIfEnabled(FQCN, Level.WARN, marker, msg, p0, p1)
+ }
+
+ override fun warn(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?) {
+ log.logIfEnabled(FQCN, Level.WARN, marker, msg, p0, p2, p2)
+ }
+
+ override fun warn(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?) {
+ log.logIfEnabled(FQCN, Level.WARN, marker, msg, p0, p1, p2, p3)
+ }
+
+ override fun warn(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?) {
+ log.logIfEnabled(FQCN, Level.WARN, marker, msg, p0, p1, p2, p3, p4)
+ }
+
+ override fun warn(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?) {
+ log.logIfEnabled(FQCN, Level.WARN, marker, msg, p0, p1, p2, p3, p4, p5)
+ }
+
+ override fun warn(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?) {
+ log.logIfEnabled(FQCN, Level.WARN, marker, msg, p0, p1, p2, p3, p4, p5, p6)
+ }
+
+ override fun warn(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?) {
+ log.logIfEnabled(FQCN, Level.WARN, marker, msg, p0, p1, p2, p3, p4, p5, p6, p7)
+ }
+
+ override fun warn(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?, p8: Any?) {
+ log.logIfEnabled(FQCN, Level.WARN, marker, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8)
+ }
+
+ override fun warn(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?, p8: Any?, p9: Any?) {
+ log.logIfEnabled(FQCN, Level.WARN, marker, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)
+ }
+
+ override fun warn(marker: Marker?, msg: Any?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.WARN, marker, msg, t)
+ }
+
+ override fun warn(msg: String?, p0: Any?) {
+ log.logIfEnabled(FQCN, Level.WARN, null, msg, p0)
+ }
+
+ override fun warn(msg: String?, p0: Any?, p1: Any?) {
+ log.logIfEnabled(FQCN, Level.WARN, null, msg, p0, p1)
+ }
+
+ override fun warn(msg: String?, p0: Any?, p1: Any?, p2: Any?) {
+ log.logIfEnabled(FQCN, Level.WARN, null, msg, p0, p1, p2)
+ }
+
+ override fun warn(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?) {
+ log.logIfEnabled(FQCN, Level.WARN, null, msg, p0, p1, p2, p3)
+ }
+
+ override fun warn(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?) {
+ log.logIfEnabled(FQCN, Level.WARN, null, msg, p0, p1, p2, p3, p4)
+ }
+
+ override fun warn(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?) {
+ log.logIfEnabled(FQCN, Level.WARN, null, msg, p0, p1, p2, p3, p4, p5)
+ }
+
+ override fun warn(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?) {
+ log.logIfEnabled(FQCN, Level.WARN, null, msg, p0, p1, p2, p3, p4, p5, p6)
+ }
+
+ override fun warn(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?) {
+ log.logIfEnabled(FQCN, Level.WARN, null, msg, p0, p1, p2, p3, p4, p5, p6, p7)
+ }
+
+ override fun warn(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?, p8: Any?) {
+ log.logIfEnabled(FQCN, Level.WARN, null, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8)
+ }
+
+ override fun warn(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?, p8: Any?, p9: Any?) {
+ log.logIfEnabled(FQCN, Level.WARN, null, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)
+ }
+
+ override fun error(marker: Marker?, msg: Message?) {
+ log.logIfEnabled(FQCN, Level.ERROR, marker, msg, null)
+ }
+
+ override fun error(marker: Marker?, msg: Message?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.ERROR, marker, msg, t)
+ }
+
+ override fun error(marker: Marker?, msg: CharSequence?) {
+ log.logIfEnabled(FQCN, Level.ERROR, marker, msg, null)
+ }
+
+ override fun error(marker: Marker?, msg: CharSequence?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.ERROR, marker, msg, t)
+ }
+
+ override fun error(marker: Marker?, msg: Any?) {
+ log.logIfEnabled(FQCN, Level.ERROR, marker, msg, null)
+ }
+
+ override fun error(marker: Marker?, msg: String?) {
+ log.logIfEnabled(FQCN, Level.ERROR, marker, msg, null as Throwable?)
+ }
+
+ override fun error(marker: Marker?, msg: String?, vararg params: Any?) {
+ log.logIfEnabled(FQCN, Level.ERROR, marker, msg, *params)
+ }
+
+ override fun error(marker: Marker?, msg: String?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.ERROR, marker, msg, t)
+ }
+
+ override fun error(msg: Message?) {
+ log.logIfEnabled(FQCN, Level.ERROR, null, msg, null)
+ }
+
+ override fun error(msg: Message?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.ERROR, null, msg, t)
+ }
+
+ override fun error(msg: CharSequence?) {
+ log.logIfEnabled(FQCN, Level.ERROR, null, msg, null)
+ }
+
+ override fun error(msg: CharSequence?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.ERROR, null, msg, t)
+ }
+
+ override fun error(msg: Any?) {
+ log.logIfEnabled(FQCN, Level.ERROR, null, msg, null)
+ }
+
+ override fun error(msg: Any?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.ERROR, null, msg, t)
+ }
+
+ override fun error(msg: String?) {
+ log.logIfEnabled(FQCN, Level.ERROR, null, msg, null as Throwable?)
+ }
+
+ override fun error(msg: String?, vararg params: Any?) {
+ log.logIfEnabled(FQCN, Level.ERROR, null, msg, *params)
+ }
+
+ override fun error(msg: String?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.ERROR, null, msg, t)
+ }
+
+ override fun error(msgSupplier: Supplier<*>?) {
+ log.logIfEnabled(FQCN, Level.ERROR, null, msgSupplier, null)
+ }
+
+ fun error(supplier: () -> Any?) {
log.logIfEnabled(FQCN, Level.ERROR, null, supplier.asLog4jSupplier(), null)
}
- inline fun error(t: Throwable, crossinline supplier: () -> Any?) {
+ override fun error(msgSupplier: Supplier<*>?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.ERROR, null, msgSupplier, t)
+ }
+
+ fun error(t: Throwable, supplier: () -> Any?) {
log.logIfEnabled(FQCN, Level.ERROR, null, supplier.asLog4jSupplier(), t)
}
- inline fun error(marker: Marker?, crossinline supplier: () -> Any?) {
+ override fun error(marker: Marker?, msgSupplier: Supplier<*>?) {
+ log.logIfEnabled(FQCN, Level.ERROR, marker, msgSupplier, null)
+ }
+
+ fun error(marker: Marker?, supplier: () -> Any?) {
log.logIfEnabled(FQCN, Level.ERROR, marker, supplier.asLog4jSupplier(), null)
}
- inline fun error(marker: Marker?, t: Throwable?, crossinline supplier: () -> Any?) {
+ override fun error(marker: Marker?, msg: String?, vararg paramSuppliers: Supplier<*>?) {
+ log.logIfEnabled(FQCN, Level.ERROR, marker, msg, *paramSuppliers)
+ }
+
+ fun error(marker: Marker?, msg: String?, vararg paramSuppliers: () -> Any?) {
+ log.logIfEnabled(FQCN, Level.ERROR, marker, msg, *paramSuppliers.asLog4jSuppliers())
+ }
+
+ override fun error(marker: Marker?, msgSupplier: Supplier<*>?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.ERROR, marker, msgSupplier, t)
+ }
+
+ fun error(marker: Marker?, t: Throwable?, supplier: () -> Any?) {
log.logIfEnabled(FQCN, Level.ERROR, marker, supplier.asLog4jSupplier(), t)
}
- inline fun fatal(crossinline supplier: () -> Any?) {
+ override fun error(msg: String?, vararg paramSuppliers: Supplier<*>?) {
+ log.logIfEnabled(FQCN, Level.ERROR, null, msg, *paramSuppliers)
+ }
+
+ fun error(msg: String?, vararg paramSuppliers: () -> Any?) {
+ log.logIfEnabled(FQCN, Level.ERROR, null, msg, *paramSuppliers.asLog4jSuppliers())
+ }
+
+ @Deprecated("Use lambda methods.", ReplaceWith("log.error(Marker, () -> Any?>)"))
+ override fun error(marker: Marker?, msgSupplier: MessageSupplier?) {
+ log.logIfEnabled(FQCN, Level.ERROR, marker, msgSupplier, null)
+ }
+
+ @Deprecated("Use lambda methods.", ReplaceWith("log.error(Marker, Throwable, () -> Any?>)"))
+ override fun error(marker: Marker?, msgSupplier: MessageSupplier?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.ERROR, marker, msgSupplier, t)
+ }
+
+ @Deprecated("Use lambda methods.", ReplaceWith("log.error(() -> Any?>)"))
+ override fun error(messageSupplier: MessageSupplier?) {
+ log.logIfEnabled(FQCN, Level.ERROR, null, messageSupplier, null)
+ }
+
+ @Deprecated("Use lambda methods.", ReplaceWith("log.error(Throwable, () -> Any?>)"))
+ override fun error(msgSupplier: MessageSupplier?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.ERROR, null, msgSupplier, t)
+ }
+
+ override fun error(marker: Marker?, msg: String?, p0: Any?) {
+ log.logIfEnabled(FQCN, Level.ERROR, marker, msg, p0)
+ }
+
+ override fun error(marker: Marker?, msg: String?, p0: Any?, p1: Any?) {
+ log.logIfEnabled(FQCN, Level.ERROR, marker, msg, p0, p1)
+ }
+
+ override fun error(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?) {
+ log.logIfEnabled(FQCN, Level.ERROR, marker, msg, p0, p2, p2)
+ }
+
+ override fun error(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?) {
+ log.logIfEnabled(FQCN, Level.ERROR, marker, msg, p0, p1, p2, p3)
+ }
+
+ override fun error(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?) {
+ log.logIfEnabled(FQCN, Level.ERROR, marker, msg, p0, p1, p2, p3, p4)
+ }
+
+ override fun error(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?) {
+ log.logIfEnabled(FQCN, Level.ERROR, marker, msg, p0, p1, p2, p3, p4, p5)
+ }
+
+ override fun error(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?) {
+ log.logIfEnabled(FQCN, Level.ERROR, marker, msg, p0, p1, p2, p3, p4, p5, p6)
+ }
+
+ override fun error(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?) {
+ log.logIfEnabled(FQCN, Level.ERROR, marker, msg, p0, p1, p2, p3, p4, p5, p6, p7)
+ }
+
+ override fun error(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?, p8: Any?) {
+ log.logIfEnabled(FQCN, Level.ERROR, marker, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8)
+ }
+
+ override fun error(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?, p8: Any?, p9: Any?) {
+ log.logIfEnabled(FQCN, Level.ERROR, marker, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)
+ }
+
+ override fun error(marker: Marker?, msg: Any?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.ERROR, marker, msg, t)
+ }
+
+ override fun error(msg: String?, p0: Any?) {
+ log.logIfEnabled(FQCN, Level.ERROR, null, msg, p0)
+ }
+
+ override fun error(msg: String?, p0: Any?, p1: Any?) {
+ log.logIfEnabled(FQCN, Level.ERROR, null, msg, p0, p1)
+ }
+
+ override fun error(msg: String?, p0: Any?, p1: Any?, p2: Any?) {
+ log.logIfEnabled(FQCN, Level.ERROR, null, msg, p0, p1, p2)
+ }
+
+ override fun error(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?) {
+ log.logIfEnabled(FQCN, Level.ERROR, null, msg, p0, p1, p2, p3)
+ }
+
+ override fun error(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?) {
+ log.logIfEnabled(FQCN, Level.ERROR, null, msg, p0, p1, p2, p3, p4)
+ }
+
+ override fun error(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?) {
+ log.logIfEnabled(FQCN, Level.ERROR, null, msg, p0, p1, p2, p3, p4, p5)
+ }
+
+ override fun error(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?) {
+ log.logIfEnabled(FQCN, Level.ERROR, null, msg, p0, p1, p2, p3, p4, p5, p6)
+ }
+
+ override fun error(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?) {
+ log.logIfEnabled(FQCN, Level.ERROR, null, msg, p0, p1, p2, p3, p4, p5, p6, p7)
+ }
+
+ override fun error(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?, p8: Any?) {
+ log.logIfEnabled(FQCN, Level.ERROR, null, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8)
+ }
+
+ override fun error(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?, p8: Any?, p9: Any?) {
+ log.logIfEnabled(FQCN, Level.ERROR, null, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)
+ }
+
+ override fun fatal(marker: Marker?, msg: Message?) {
+ log.logIfEnabled(FQCN, Level.FATAL, marker, msg, null)
+ }
+
+ override fun fatal(marker: Marker?, msg: Message?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.FATAL, marker, msg, t)
+ }
+
+ override fun fatal(marker: Marker?, msg: CharSequence?) {
+ log.logIfEnabled(FQCN, Level.FATAL, marker, msg, null)
+ }
+
+ override fun fatal(marker: Marker?, msg: CharSequence?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.FATAL, marker, msg, t)
+ }
+
+ override fun fatal(marker: Marker?, msg: Any?) {
+ log.logIfEnabled(FQCN, Level.FATAL, marker, msg, null)
+ }
+
+ override fun fatal(marker: Marker?, msg: String?) {
+ log.logIfEnabled(FQCN, Level.FATAL, marker, msg, null as Throwable?)
+ }
+
+ override fun fatal(marker: Marker?, msg: String?, vararg params: Any?) {
+ log.logIfEnabled(FQCN, Level.FATAL, marker, msg, *params)
+ }
+
+ override fun fatal(marker: Marker?, msg: String?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.FATAL, marker, msg, t)
+ }
+
+ override fun fatal(msg: Message?) {
+ log.logIfEnabled(FQCN, Level.FATAL, null, msg, null)
+ }
+
+ override fun fatal(msg: Message?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.FATAL, null, msg, t)
+ }
+
+ override fun fatal(msg: CharSequence?) {
+ log.logIfEnabled(FQCN, Level.FATAL, null, msg, null)
+ }
+
+ override fun fatal(msg: CharSequence?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.FATAL, null, msg, t)
+ }
+
+ override fun fatal(msg: Any?) {
+ log.logIfEnabled(FQCN, Level.FATAL, null, msg, null)
+ }
+
+ override fun fatal(msg: Any?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.FATAL, null, msg, t)
+ }
+
+ override fun fatal(msg: String?) {
+ log.logIfEnabled(FQCN, Level.FATAL, null, msg, null as Throwable?)
+ }
+
+ override fun fatal(msg: String?, vararg params: Any?) {
+ log.logIfEnabled(FQCN, Level.FATAL, null, msg, *params)
+ }
+
+ override fun fatal(msg: String?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.FATAL, null, msg, t)
+ }
+
+ override fun fatal(msgSupplier: Supplier<*>?) {
+ log.logIfEnabled(FQCN, Level.FATAL, null, msgSupplier, null)
+ }
+
+ fun fatal(supplier: () -> Any?) {
log.logIfEnabled(FQCN, Level.FATAL, null, supplier.asLog4jSupplier(), null)
}
- inline fun fatal(t: Throwable, crossinline supplier: () -> Any?) {
+ override fun fatal(msgSupplier: Supplier<*>?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.FATAL, null, msgSupplier, t)
+ }
+
+ fun fatal(t: Throwable, supplier: () -> Any?) {
log.logIfEnabled(FQCN, Level.FATAL, null, supplier.asLog4jSupplier(), t)
}
- inline fun fatal(marker: Marker?, crossinline supplier: () -> Any?) {
+ override fun fatal(marker: Marker?, msgSupplier: Supplier<*>?) {
+ log.logIfEnabled(FQCN, Level.FATAL, marker, msgSupplier, null)
+ }
+
+ fun fatal(marker: Marker?, supplier: () -> Any?) {
log.logIfEnabled(FQCN, Level.FATAL, marker, supplier.asLog4jSupplier(), null)
}
- inline fun fatal(marker: Marker?, t: Throwable?, crossinline supplier: () -> Any?) {
+ override fun fatal(marker: Marker?, msg: String?, vararg paramSuppliers: Supplier<*>?) {
+ log.logIfEnabled(FQCN, Level.FATAL, marker, msg, *paramSuppliers)
+ }
+
+ fun fatal(marker: Marker?, msg: String?, vararg paramSuppliers: () -> Any?) {
+ log.logIfEnabled(FQCN, Level.FATAL, marker, msg, *paramSuppliers.asLog4jSuppliers())
+ }
+
+ override fun fatal(marker: Marker?, msgSupplier: Supplier<*>?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.FATAL, marker, msgSupplier, t)
+ }
+
+ fun fatal(marker: Marker?, t: Throwable?, supplier: () -> Any?) {
log.logIfEnabled(FQCN, Level.FATAL, marker, supplier.asLog4jSupplier(), t)
}
- inline fun <R : Any?> trace(block: () -> R): R {
- val entry = traceEntry()
- try {
- val result = block()
- when(result) {
- Unit -> traceExit(entry)
- else -> traceExit(entry, result)
- }
- return result
- } catch (e: Throwable) {
- catching(e)
- throw e
- }
+ override fun fatal(msg: String?, vararg paramSuppliers: Supplier<*>?) {
+ log.logIfEnabled(FQCN, Level.FATAL, null, msg, *paramSuppliers)
}
- inline fun <R : Any?> trace(crossinline supplier: () -> Any?, block: () -> R): R {
- val entry = traceEntry(supplier.asLog4jSupplier())
- try {
- val result = block()
- when(result) {
- Unit -> traceExit(entry)
- else -> traceExit(entry, result)
- }
- return result
- } catch (e: Throwable) {
- catching(e)
- throw e
- }
+ fun fatal(msg: String?, vararg paramSuppliers: () -> Any?) {
+ log.logIfEnabled(FQCN, Level.FATAL, null, msg, *paramSuppliers.asLog4jSuppliers())
}
- // define overrides for deprecated MessageSupplier methods, otherwise Kotlin dispatches these over our methods (why?)
- @Deprecated("Use lambda methods.", ReplaceWith("log.trace(Supplier<Message>)"))
- override inline fun trace(messageSupplier: MessageSupplier?) {
- log.logIfEnabled(FQCN, Level.TRACE, null, messageSupplier, null)
+ @Deprecated("Use lambda methods.", ReplaceWith("log.fatal(Marker, () -> Any?>)"))
+ override fun fatal(marker: Marker?, msgSupplier: MessageSupplier?) {
+ log.logIfEnabled(FQCN, Level.FATAL, marker, msgSupplier, null)
}
- @Deprecated("Use lambda methods.", ReplaceWith("log.debug(Supplier<Message>)"))
- override inline fun debug(messageSupplier: MessageSupplier?) {
- log.logIfEnabled(FQCN, Level.DEBUG, null, messageSupplier, null)
+
+ @Deprecated("Use lambda methods.", ReplaceWith("log.fatal(Marker, Throwable, () -> Any?>)"))
+ override fun fatal(marker: Marker?, msgSupplier: MessageSupplier?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.FATAL, marker, msgSupplier, t)
}
- @Deprecated("Use lambda methods.", ReplaceWith("log.info(Supplier<Message>)"))
- override inline fun info(messageSupplier: MessageSupplier?) {
- log.logIfEnabled(FQCN, Level.INFO, null, messageSupplier, null)
- }
- @Deprecated("Use lambda methods.", ReplaceWith("log.warn(Supplier<Message>)"))
- override inline fun warn(messageSupplier: MessageSupplier?) {
- log.logIfEnabled(FQCN, Level.WARN, null, messageSupplier, null)
- }
- @Deprecated("Use lambda methods.", ReplaceWith("log.error(Supplier<Message>)"))
- override inline fun error(messageSupplier: MessageSupplier?) {
- log.logIfEnabled(FQCN, Level.ERROR, null, messageSupplier, null)
- }
- @Deprecated("Use lambda methods.", ReplaceWith("log.fatal(Supplier<Message>)"))
- override inline fun fatal(messageSupplier: MessageSupplier?) {
+
+ @Deprecated("Use lambda methods.", ReplaceWith("log.fatal(() -> Any?>)"))
+ override fun fatal(messageSupplier: MessageSupplier?) {
log.logIfEnabled(FQCN, Level.FATAL, null, messageSupplier, null)
}
+
+ @Deprecated("Use lambda methods.", ReplaceWith("log.fatal(Throwable, () -> Any?>)"))
+ override fun fatal(msgSupplier: MessageSupplier?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.FATAL, null, msgSupplier, t)
+ }
+
+ override fun fatal(marker: Marker?, msg: String?, p0: Any?) {
+ log.logIfEnabled(FQCN, Level.FATAL, marker, msg, p0)
+ }
+
+ override fun fatal(marker: Marker?, msg: String?, p0: Any?, p1: Any?) {
+ log.logIfEnabled(FQCN, Level.FATAL, marker, msg, p0, p1)
+ }
+
+ override fun fatal(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?) {
+ log.logIfEnabled(FQCN, Level.FATAL, marker, msg, p0, p2, p2)
+ }
+
+ override fun fatal(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?) {
+ log.logIfEnabled(FQCN, Level.FATAL, marker, msg, p0, p1, p2, p3)
+ }
+
+ override fun fatal(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?) {
+ log.logIfEnabled(FQCN, Level.FATAL, marker, msg, p0, p1, p2, p3, p4)
+ }
+
+ override fun fatal(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?) {
+ log.logIfEnabled(FQCN, Level.FATAL, marker, msg, p0, p1, p2, p3, p4, p5)
+ }
+
+ override fun fatal(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?) {
+ log.logIfEnabled(FQCN, Level.FATAL, marker, msg, p0, p1, p2, p3, p4, p5, p6)
+ }
+
+ override fun fatal(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?) {
+ log.logIfEnabled(FQCN, Level.FATAL, marker, msg, p0, p1, p2, p3, p4, p5, p6, p7)
+ }
+
+ override fun fatal(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?, p8: Any?) {
+ log.logIfEnabled(FQCN, Level.FATAL, marker, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8)
+ }
+
+ override fun fatal(marker: Marker?, msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?, p8: Any?, p9: Any?) {
+ log.logIfEnabled(FQCN, Level.FATAL, marker, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)
+ }
+
+ override fun fatal(marker: Marker?, msg: Any?, t: Throwable?) {
+ log.logIfEnabled(FQCN, Level.FATAL, marker, msg, t)
+ }
+
+ override fun fatal(msg: String?, p0: Any?) {
+ log.logIfEnabled(FQCN, Level.FATAL, null, msg, p0)
+ }
+
+ override fun fatal(msg: String?, p0: Any?, p1: Any?) {
+ log.logIfEnabled(FQCN, Level.FATAL, null, msg, p0, p1)
+ }
+
+ override fun fatal(msg: String?, p0: Any?, p1: Any?, p2: Any?) {
+ log.logIfEnabled(FQCN, Level.FATAL, null, msg, p0, p1, p2)
+ }
+
+ override fun fatal(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?) {
+ log.logIfEnabled(FQCN, Level.FATAL, null, msg, p0, p1, p2, p3)
+ }
+
+ override fun fatal(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?) {
+ log.logIfEnabled(FQCN, Level.FATAL, null, msg, p0, p1, p2, p3, p4)
+ }
+
+ override fun fatal(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?) {
+ log.logIfEnabled(FQCN, Level.FATAL, null, msg, p0, p1, p2, p3, p4, p5)
+ }
+
+ override fun fatal(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?) {
+ log.logIfEnabled(FQCN, Level.FATAL, null, msg, p0, p1, p2, p3, p4, p5, p6)
+ }
+
+ override fun fatal(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?) {
+ log.logIfEnabled(FQCN, Level.FATAL, null, msg, p0, p1, p2, p3, p4, p5, p6, p7)
+ }
+
+ override fun fatal(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?, p8: Any?) {
+ log.logIfEnabled(FQCN, Level.FATAL, null, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8)
+ }
+
+ override fun fatal(msg: String?, p0: Any?, p1: Any?, p2: Any?, p3: Any?, p4: Any?, p5: Any?, p6: Any?, p7: Any?, p8: Any?, p9: Any?) {
+ log.logIfEnabled(FQCN, Level.FATAL, null, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)
+ }
}
/**
diff --git a/log4j-api-kotlin/src/test/kotlin/org.apache.logging.log4j.kotlin/LoggerTest.kt b/log4j-api-kotlin/src/test/kotlin/org.apache.logging.log4j.kotlin/LoggerTest.kt
index 0683150..f8c4a59 100644
--- a/log4j-api-kotlin/src/test/kotlin/org.apache.logging.log4j.kotlin/LoggerTest.kt
+++ b/log4j-api-kotlin/src/test/kotlin/org.apache.logging.log4j.kotlin/LoggerTest.kt
@@ -67,8 +67,9 @@
}
whenever(f.mockLogger.isEnabled(Level.ERROR)).thenReturn(true)
val logger = FunctionalLogger(f.mockLogger)
- logger.error("This is an error log.")
- verify(f.mockLogger).error(anyString())
+ val msg = "This is an error log."
+ logger.error(msg)
+ verify(f.mockLogger).logIfEnabled(anyString(), eq(Level.ERROR), isNull(), eq(msg), isNull<Throwable>())
}
@Test
@@ -77,8 +78,9 @@
on { isEnabled(Level.FATAL) } doReturn true
}
val logger = FunctionalLogger(f.mockLogger)
- logger.fatal("string msg with value: ${f.manager.fetchValue()}")
- verify(f.mockLogger).fatal(anyString())
+ val msg = "string msg with value: ${f.manager.fetchValue()}"
+ logger.fatal(msg)
+ verify(f.mockLogger).logIfEnabled(anyString(), eq(Level.FATAL), isNull(), eq(msg), isNull<Throwable>())
verify(f.manager).fetchValue()
}
@@ -91,8 +93,9 @@
}
whenever(f.mockLogger.isEnabled(Level.FATAL)).thenReturn(false)
val logger = FunctionalLogger(f.mockLogger)
- logger.fatal("string msg with value: ${f.manager.fetchValue()}")
- verify(f.mockLogger).fatal(anyString())
+ val msg = "string msg with value: ${f.manager.fetchValue()}"
+ logger.fatal(msg)
+ verify(f.mockLogger).logIfEnabled(anyString(), eq(Level.FATAL), isNull(), eq(msg), isNull<Throwable>())
verify(f.manager).fetchValue()
}
