1.0.1 via 2.1

Author: ExplodingDragon

logger-slf4j/build.gradle.kts

@@ -14,18 +14,18 @@ val compileKotlin: KotlinCompile by tasks
 val compileJava: JavaCompile by tasks
 compileJava.destinationDirectory.set(compileKotlin.destinationDirectory.get())
 
-val slf4jVersion = "1.7.31"
+val slf4jVersion = "1.7.32"
 
 dependencies {
     implementation(kotlin("reflect"))
     implementation(kotlin("stdlib"))
-    compileOnly("com.github.OpenEdgn.Logger4K:logger-core:2.0.2")
+    compileOnly("com.github.OpenEdgn.Logger4K:logger-core:2.1.0")
     compileOnly("org.slf4j:slf4j-api:$slf4jVersion")
     testImplementation("org.slf4j:slf4j-api:$slf4jVersion")
     testImplementation("ch.qos.logback:logback-core:1.2.5")
     testImplementation("ch.qos.logback:logback-core:1.2.5")
-    testImplementation("com.github.OpenEdgn.Logger4K:logger-core:2.0.2")
     testImplementation("org.slf4j:slf4j-simple:$slf4jVersion")
+    testImplementation("com.github.OpenEdgn.Logger4K:logger-core:2.1.0")
     testImplementation("org.junit.jupiter:junit-jupiter:5.6.2")
     testImplementation("org.junit.platform:junit-platform-launcher:1.6.2")
 }

logger-slf4j/src/main/java/module-info.java

@@ -1,11 +1,11 @@
+import logger.forward.slf4j.SLF4JLogApi;
+
 module logger4k.impl {
     requires kotlin.stdlib;
     requires logger4k.core;
     requires kotlin.reflect;
     requires org.slf4j;
-    exports logger4k.impl.slf4j;
-    opens logger4k.impl.slf4j to logger4k.core;
-    provides com.github.openEdgn.logger4k.plugin.IPlugin with logger4k.LoggerPlugin;
-    exports logger4k;
-    opens logger4k to logger4k.core;
+    exports logger.forward.slf4j;
+    opens logger.forward.slf4j to logger4k.core;
+    provides  com.github.openEdgn.logger4k.api.ILogApi with SLF4JLogApi;
 }

…c/main/kotlin/logger4k/impl/slf4j/Ext.kt …/main/kotlin/logger/forward/slf4j/Ext.ktlogger-slf4j/src/main/kotlin/logger4k/impl/slf4j/Ext.kt renamed to logger-slf4j/src/main/kotlin/logger/forward/slf4j/Ext.kt logger-slf4j/src/main/kotlin/logger4k/impl/slf4j/Ext.kt renamed to logger-slf4j/src/main/kotlin/logger/forward/slf4j/Ext.kt

@@ -18,7 +18,7 @@
  * SOFTWARE.
  */
 
-package logger4k.impl.slf4j
+package logger.forward.slf4j
 
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory

logger-slf4j/src/main/kotlin/logger/forward/slf4j/SLF4JLogApi.kt

@@ -0,0 +1,13 @@
+package logger.forward.slf4j
+
+import com.github.openEdgn.logger4k.api.ILogApi
+import com.github.openEdgn.logger4k.api.ILogOutputApi
+
+class SLF4JLogApi : ILogApi {
+
+    override val name = "SlF4JLog"
+
+    override fun init(): ILogOutputApi {
+        return SLF4JLogOutputApi()
+    }
+}

logger-slf4j/src/main/kotlin/logger/forward/slf4j/SLF4JLogOutputApi.kt

@@ -0,0 +1,64 @@
+package logger.forward.slf4j
+
+import com.github.openEdgn.logger4k.LoggerLevel
+import com.github.openEdgn.logger4k.api.ILogOutputApi
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+import java.time.LocalDateTime
+
+class SLF4JLogOutputApi : ILogOutputApi {
+
+    private fun getSLF4JLog(name: String): Logger {
+        return LoggerFactory.getLogger(name)
+    }
+
+    override fun outputLevel(name: String): LoggerLevel {
+        val jLog = getSLF4JLog(name)
+        return if (jLog.isTraceEnabled) {
+            LoggerLevel.TRACE
+        } else if (jLog.isDebugEnabled) {
+            LoggerLevel.DEBUG
+        } else if (jLog.isInfoEnabled) {
+            LoggerLevel.INFO
+        } else if (jLog.isWarnEnabled) {
+            LoggerLevel.WARN
+        } else if (jLog.isErrorEnabled) {
+            LoggerLevel.ERROR
+        } else {
+            LoggerLevel.OFF
+        }
+    }
+
+    override fun outputLogger(name: String, thread: Thread, date: LocalDateTime, level: LoggerLevel, message: String) {
+        getSLF4JLog(name).run {
+            when (level) {
+                LoggerLevel.TRACE -> trace(message)
+                LoggerLevel.DEBUG -> debug(message)
+                LoggerLevel.INFO -> info(message)
+                LoggerLevel.WARN -> warn(message)
+                LoggerLevel.ERROR -> error(message)
+                LoggerLevel.OFF -> return
+            }
+        }
+    }
+
+    override fun outputLogger(
+        name: String,
+        thread: Thread,
+        date: LocalDateTime,
+        level: LoggerLevel,
+        message: String,
+        exception: Throwable
+    ) {
+        getSLF4JLog(name).run {
+            when (level) {
+                LoggerLevel.TRACE -> trace(message, exception)
+                LoggerLevel.DEBUG -> debug(message, exception)
+                LoggerLevel.INFO -> info(message, exception)
+                LoggerLevel.WARN -> warn(message, exception)
+                LoggerLevel.ERROR -> error(message, exception)
+                LoggerLevel.OFF -> return
+            }
+        }
+    }
+}

logger-slf4j/src/main/kotlin/logger4k/LoggerPlugin.kt

@@ -0,0 +1 @@
+logger.forward.slf4j.SLF4JLogApi

logger-slf4j/src/main/kotlin/logger4k/impl/slf4j/SLF4JLogger.kt

@@ -21,6 +21,7 @@
 package logger4k.impl.slf4j
 
 import com.github.openEdgn.logger4k.LoggerFactory
+import logger.forward.slf4j.getSLF4JLogger
 import org.junit.jupiter.api.Test
 import org.slf4j.MarkerFactory
 import java.io.IOException
@@ -41,6 +42,7 @@ internal class SLF4JLoggerTest {
 
     @Test
     fun testDebug() {
+        println(logger.level)
         logger.debug("Hello World.")
         logger.debug("Hello World, {} .", "dragon")
         logger.debugThrowable("Exception", IOException())