From a7d6f4a21149dae496c6a973dd1bfc59ef74ccd5 Mon Sep 17 00:00:00 2001 From: tursom Date: Sat, 30 Nov 2019 10:35:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- log/src/main/kotlin/cn/tursom/log/Slf4j.kt | 8 ++++---- log/src/main/kotlin/cn/tursom/log/impl/Slf4jImpl.kt | 6 +----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/log/src/main/kotlin/cn/tursom/log/Slf4j.kt b/log/src/main/kotlin/cn/tursom/log/Slf4j.kt index 24c7e76..e6bc0b6 100644 --- a/log/src/main/kotlin/cn/tursom/log/Slf4j.kt +++ b/log/src/main/kotlin/cn/tursom/log/Slf4j.kt @@ -2,8 +2,8 @@ package cn.tursom.log import org.slf4j.Logger -interface Slf4j { - val log: Logger - val logger get() = log - val sfl4j get() = log +interface Slf4j : TrySlf4j { + override val log: Logger + override val logger get() = log + override val sfl4j get() = log } \ No newline at end of file diff --git a/log/src/main/kotlin/cn/tursom/log/impl/Slf4jImpl.kt b/log/src/main/kotlin/cn/tursom/log/impl/Slf4jImpl.kt index 95ca796..74a44e9 100644 --- a/log/src/main/kotlin/cn/tursom/log/impl/Slf4jImpl.kt +++ b/log/src/main/kotlin/cn/tursom/log/impl/Slf4jImpl.kt @@ -1,13 +1,12 @@ package cn.tursom.log.impl import cn.tursom.log.Slf4j -import cn.tursom.log.TrySlf4j import org.slf4j.Logger import org.slf4j.LoggerFactory import kotlin.reflect.KClass import kotlin.reflect.jvm.jvmName -class Slf4jImpl(name: String? = null) : Slf4j, TrySlf4j { +class Slf4jImpl(name: String? = null) : Slf4j { constructor(clazz: Class<*>?) : this(clazz?.name) constructor(clazz: KClass<*>?) : this(clazz?.jvmName?.let { if (clazz.isCompanion) it.dropLast(10) else it @@ -21,7 +20,4 @@ class Slf4jImpl(name: String? = null) : Slf4j, TrySlf4j { } else { throw NotImplementedError("") }) - - override val logger: Logger get() = log - override val sfl4j: Logger get() = log } \ No newline at end of file