V5 (#330)

Impl version 5: 
- change the api of KLogger that will contain fluent api (KLoggingEventBuilder).  
- make KLogger api lighter and remove methods such as `fun trace(msg: String?, arg: Any?)`.

Basically the idea is to reduce the signature, and make it more "kotlin friendly".

As a side effect this will also make the lib implementation a bit simpler, as right now inheritance is a bit complex and has a lot of duplication.


Noteable changes:

* add base slf4j class
* remove NamedKLogging,KLogging,KLoggable
* fix compilation
* fix tests
* remove redundunt inline
* add release branch github-release-5.x

Author: oshai

.github/workflows/cd.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - github-release
       - github-release-4.x
+      - github-release-5.x
 
 jobs:
   release:

src/androidMain/kotlin/io/github/oshai/kotlinlogging/internal/KLoggerAndroid.kt

@@ -2,328 +2,34 @@ package io.github.oshai.kotlinlogging.internal
 
 import android.util.Log
 import io.github.oshai.kotlinlogging.KLogger
+import io.github.oshai.kotlinlogging.KLoggingEventBuilder
+import io.github.oshai.kotlinlogging.Level
 import io.github.oshai.kotlinlogging.Marker
 
-@Suppress("TooManyFunctions")
 internal class KLoggerAndroid(override val name: String) : KLogger {
-  override val underlyingLogger: Any
-    get() = TODO("Not implemented")
-
-  override fun trace(msg: String?) = trace { msg }
-
-  override fun trace(msg: String?, arg: Any?) {
-    TODO("Not implemented")
-  }
-
-  override fun trace(msg: String?, arg1: Any?, arg2: Any?) {
-    TODO("Not implemented")
-  }
-
-  override fun trace(msg: String?, vararg arguments: Any?) {
-    TODO("Not implemented")
-  }
-
-  override fun trace(msg: String?, t: Throwable?) = trace(t) { msg }
-
-  override fun trace(marker: Marker?, msg: String?) {
-    TODO("Not implemented")
-  }
-
-  override fun trace(marker: Marker?, msg: String?, arg: Any?) {
-    TODO("Not implemented")
-  }
-
-  override fun trace(marker: Marker?, msg: String?, arg1: Any?, arg2: Any?) {
-    TODO("Not implemented")
-  }
-
-  override fun trace(marker: Marker?, msg: String?, vararg arguments: Any?) {
-    TODO("Not implemented")
-  }
-
-  override fun trace(marker: Marker?, msg: String?, t: Throwable?) {
-    TODO("Not implemented")
-  }
-
-  override fun trace(msg: () -> Any?) {
-    if (isTraceEnabled) {
-      Log.v(name, msg.toStringSafe())
-    }
-  }
-
-  override fun debug(msg: () -> Any?) {
-    if (isDebugEnabled) {
-      Log.d(name, msg.toStringSafe())
-    }
-  }
-  override fun info(msg: () -> Any?) {
-    if (isInfoEnabled) {
-      Log.i(name, msg.toStringSafe())
-    }
-  }
-  override fun warn(msg: () -> Any?) {
-    if (isWarnEnabled) {
-      Log.w(name, msg.toStringSafe())
-    }
-  }
-  override fun error(msg: () -> Any?) {
-    if (isErrorEnabled) {
-      Log.e(name, msg.toStringSafe())
-    }
-  }
-  override fun trace(t: Throwable?, msg: () -> Any?) {
-    if (isTraceEnabled) {
-      Log.v(name, msg.toStringSafe(), t)
-    }
-  }
-  override fun debug(t: Throwable?, msg: () -> Any?) {
-    if (isDebugEnabled) {
-      Log.d(name, msg.toStringSafe(), t)
-    }
-  }
-  override fun info(t: Throwable?, msg: () -> Any?) {
-    if (isInfoEnabled) {
-      Log.i(name, msg.toStringSafe(), t)
+  override fun at(level: Level, marker: Marker?, block: KLoggingEventBuilder.() -> Unit) {
+    if (isLoggingEnabledFor(level, marker)) {
+      KLoggingEventBuilder().apply(block).run {
+        when (level) {
+          Level.TRACE -> Log.v(name, this.message, this.cause)
+          Level.DEBUG -> Log.d(name, this.message, this.cause)
+          Level.INFO -> Log.i(name, this.message, this.cause)
+          Level.WARN -> Log.w(name, this.message, this.cause)
+          Level.ERROR -> Log.e(name, this.message, this.cause)
+          Level.OFF -> Unit
+        }
+      }
+    }
+  }
+
+  override fun isLoggingEnabledFor(level: Level, marker: Marker?): Boolean {
+    return when (level) {
+      Level.TRACE -> Log.isLoggable(name, Log.VERBOSE)
+      Level.DEBUG -> Log.isLoggable(name, Log.DEBUG)
+      Level.INFO -> Log.isLoggable(name, Log.INFO)
+      Level.WARN -> Log.isLoggable(name, Log.WARN)
+      Level.ERROR -> Log.isLoggable(name, Log.ERROR)
+      Level.OFF -> false
     }
   }
-  override fun warn(t: Throwable?, msg: () -> Any?) {
-    if (isWarnEnabled) {
-      Log.w(name, msg.toStringSafe(), t)
-    }
-  }
-  override fun error(t: Throwable?, msg: () -> Any?) {
-    if (isErrorEnabled) {
-      Log.e(name, msg.toStringSafe(), t)
-    }
-  }
-  override fun trace(marker: Marker?, msg: () -> Any?) = trace(msg)
-
-  override fun debug(marker: Marker?, msg: () -> Any?) = debug(msg)
-
-  override fun info(marker: Marker?, msg: () -> Any?) = info(msg)
-
-  override fun warn(marker: Marker?, msg: () -> Any?) = warn(msg)
-
-  override fun error(marker: Marker?, msg: () -> Any?) = error(msg)
-
-  override fun trace(marker: Marker?, t: Throwable?, msg: () -> Any?) = trace(t, msg)
-  override fun isTraceEnabled(marker: Marker?): Boolean = isTraceEnabled
-
-  override fun debug(msg: String?) = debug { msg }
-
-  override fun debug(msg: String?, arg: Any?) {
-    TODO("Not implemented")
-  }
-
-  override fun debug(msg: String?, arg1: Any?, arg2: Any?) {
-    TODO("Not implemented")
-  }
-
-  override fun debug(msg: String?, vararg arguments: Any?) {
-    TODO("Not implemented")
-  }
-
-  override fun debug(msg: String?, t: Throwable?) = debug(t) { msg }
-
-  override fun debug(marker: Marker?, msg: String?) {
-    TODO("Not implemented")
-  }
-
-  override fun debug(marker: Marker?, msg: String?, arg: Any?) {
-    TODO("Not implemented")
-  }
-
-  override fun debug(marker: Marker?, msg: String?, arg1: Any?, arg2: Any?) {
-    TODO("Not implemented")
-  }
-
-  override fun debug(marker: Marker?, msg: String?, vararg arguments: Any?) {
-    TODO("Not implemented")
-  }
-
-  override fun debug(marker: Marker?, msg: String?, t: Throwable?) {
-    TODO("Not implemented")
-  }
-
-  override fun debug(marker: Marker?, t: Throwable?, msg: () -> Any?) = debug(t, msg)
-  override fun isDebugEnabled(marker: Marker?): Boolean = isDebugEnabled
-
-  override fun info(msg: String?) = info { msg }
-
-  override fun info(msg: String?, arg: Any?) {
-    TODO("Not implemented")
-  }
-
-  override fun info(msg: String?, arg1: Any?, arg2: Any?) {
-    TODO("Not implemented")
-  }
-
-  override fun info(msg: String?, vararg arguments: Any?) {
-    TODO("Not implemented")
-  }
-
-  override fun info(msg: String?, t: Throwable?) = info(t) { msg }
-
-  override fun info(marker: Marker?, msg: String?) {
-    TODO("Not implemented")
-  }
-
-  override fun info(marker: Marker?, msg: String?, arg: Any?) {
-    TODO("Not implemented")
-  }
-
-  override fun info(marker: Marker?, msg: String?, arg1: Any?, arg2: Any?) {
-    TODO("Not implemented")
-  }
-
-  override fun info(marker: Marker?, msg: String?, vararg arguments: Any?) {
-    TODO("Not implemented")
-  }
-
-  override fun info(marker: Marker?, msg: String?, t: Throwable?) {
-    TODO("Not implemented")
-  }
-
-  override fun info(marker: Marker?, t: Throwable?, msg: () -> Any?) = info(t, msg)
-  override fun isInfoEnabled(marker: Marker?): Boolean = isInfoEnabled
-
-  override fun warn(msg: String?) = warn { msg }
-
-  override fun warn(msg: String?, arg: Any?) {
-    TODO("Not implemented")
-  }
-
-  override fun warn(msg: String?, vararg arguments: Any?) {
-    TODO("Not implemented")
-  }
-
-  override fun warn(msg: String?, arg1: Any?, arg2: Any?) {
-    TODO("Not implemented")
-  }
-
-  override fun warn(msg: String?, t: Throwable?) = warn(t) { msg }
-
-  override fun warn(marker: Marker?, msg: String?) {
-    TODO("Not implemented")
-  }
-
-  override fun warn(marker: Marker?, msg: String?, arg: Any?) {
-    TODO("Not implemented")
-  }
-
-  override fun warn(marker: Marker?, msg: String?, arg1: Any?, arg2: Any?) {
-    TODO("Not implemented")
-  }
-
-  override fun warn(marker: Marker?, msg: String?, vararg arguments: Any?) {
-    TODO("Not implemented")
-  }
-
-  override fun warn(marker: Marker?, msg: String?, t: Throwable?) {
-    TODO("Not implemented")
-  }
-
-  override fun warn(marker: Marker?, t: Throwable?, msg: () -> Any?) = warn(t, msg)
-  override fun isWarnEnabled(marker: Marker?): Boolean = isWarnEnabled
-
-  override fun error(msg: String?) = error { msg }
-
-  override fun error(msg: String?, arg: Any?) {
-    TODO("Not implemented")
-  }
-
-  override fun error(msg: String?, arg1: Any?, arg2: Any?) {
-    TODO("Not implemented")
-  }
-
-  override fun error(msg: String?, vararg arguments: Any?) {
-    TODO("Not implemented")
-  }
-
-  override fun error(msg: String?, t: Throwable?) = error(t) { msg }
-
-  override fun error(marker: Marker?, msg: String?) {
-    TODO("Not implemented")
-  }
-
-  override fun error(marker: Marker?, msg: String?, arg: Any?) {
-    TODO("Not implemented")
-  }
-
-  override fun error(marker: Marker?, msg: String?, arg1: Any?, arg2: Any?) {
-    TODO("Not implemented")
-  }
-
-  override fun error(marker: Marker?, msg: String?, vararg arguments: Any?) {
-    TODO("Not implemented")
-  }
-
-  override fun error(marker: Marker?, msg: String?, t: Throwable?) {
-    TODO("Not implemented")
-  }
-
-  override fun error(marker: Marker?, t: Throwable?, msg: () -> Any?) = error(t, msg)
-  override fun isErrorEnabled(marker: Marker?): Boolean = isErrorEnabled
-
-  override fun isLoggingOff(marker: Marker?): Boolean = isLoggingOff
-
-  override fun entry(vararg arguments: Any?) = trace { "entry($arguments)" }
-
-  override fun exit() = trace { "exit()" }
-
-  override fun <T : Any?> exit(result: T): T {
-    trace { "exit($result)" }
-    return result
-  }
-
-  override fun <T : Throwable> throwing(throwable: T): T {
-    error(throwable) { "throwing($throwable)" }
-    return throwable
-  }
-
-  override fun <T : Throwable> catching(throwable: T) {
-    error(throwable) { "catching($throwable)" }
-  }
-
-  /**
-   * Is the logger instance enabled for the TRACE level?
-   *
-   * @return True if this Logger is enabled for the TRACE level, false otherwise.
-   */
-  override val isTraceEnabled: Boolean = Log.isLoggable(name, Log.VERBOSE)
-
-  /**
-   * Is the logger instance enabled for the DEBUG level?
-   *
-   * @return True if this Logger is enabled for the DEBUG level, false otherwise.
-   */
-  override val isDebugEnabled: Boolean = Log.isLoggable(name, Log.DEBUG)
-
-  /**
-   * Is the logger instance enabled for the INFO level?
-   *
-   * @return True if this Logger is enabled for the INFO level, false otherwise.
-   */
-  override val isInfoEnabled: Boolean = Log.isLoggable(name, Log.INFO)
-
-  /**
-   * Is the logger instance enabled for the WARN level?
-   *
-   * @return True if this Logger is enabled for the WARN level, false otherwise.
-   */
-  override val isWarnEnabled: Boolean = Log.isLoggable(name, Log.WARN)
-
-  /**
-   * Is the logger instance enabled for the ERROR level?
-   *
-   * @return True if this Logger is enabled for the ERROR level, false otherwise.
-   */
-  override val isErrorEnabled: Boolean = Log.isLoggable(name, Log.ERROR)
-
-  /**
-   * Is the logger instance OFF?
-   *
-   * @return True if this Logger is set to the OFF level, false otherwise.
-   */
-  override val isLoggingOff: Boolean = !Log.isLoggable(name, Log.ASSERT)
 }

src/androidMain/kotlin/io/github/oshai/kotlinlogging/internal/KLoggerFactory.kt

@@ -3,10 +3,9 @@ package io.github.oshai.kotlinlogging.internal
 import io.github.oshai.kotlinlogging.KLogger
 import io.github.oshai.kotlinlogging.slf4j.internal.Slf4jLoggerFactory
 
-@Suppress("NOTHING_TO_INLINE")
 internal actual object KLoggerFactory {
 
-  internal actual inline fun logger(name: String): KLogger {
+  internal actual fun logger(name: String): KLogger {
     if (System.getProperty("kotlin-logging-to-android-native") != null) {
       return KLoggerAndroid(name)
     }