From 6017331f6b55718273f93c75128f8c96a8117b85 Mon Sep 17 00:00:00 2001 From: Robinson Date: Wed, 13 Sep 2023 16:13:32 +0200 Subject: [PATCH] Removed KotlinLogging (it has a niche usage that did not apply) --- LICENSE | 6 ------ build.gradle.kts | 4 +--- src/dorkbox/storage/Storage.kt | 20 +++++++++---------- .../storage/types/ChronicleMapStore.kt | 6 +++--- src/dorkbox/storage/types/JsonStore.kt | 4 ++-- src/dorkbox/storage/types/LmdbStore.kt | 6 +++--- src/dorkbox/storage/types/MemoryStore.kt | 6 +++--- src/dorkbox/storage/types/PropertyStore.kt | 6 +++--- src/dorkbox/storage/types/StringStore.kt | 4 ++-- src9/module-info.java | 1 - 10 files changed, 27 insertions(+), 36 deletions(-) diff --git a/LICENSE b/LICENSE index b55225e..bd73190 100644 --- a/LICENSE +++ b/LICENSE @@ -5,12 +5,6 @@ Dorkbox LLC Extra license information - - kotlin-logging - Lightweight logging framework for Kotlin - [The Apache Software License, Version 2.0] - https://github.com/MicroUtils/kotlin-logging - Copyright 2023 - Ohad Shai - - Kryo - Fast and efficient binary object graph serialization framework for Java [BSD 3-Clause License] https://github.com/EsotericSoftware/kryo diff --git a/build.gradle.kts b/build.gradle.kts index e2e39b2..5302cdf 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -97,9 +97,7 @@ dependencies { // compileOnly("net.openhft:chronicle-map:3.21.86") - // https://github.com/MicroUtils/kotlin-logging - api("io.github.microutils:kotlin-logging:3.0.5") - implementation("org.slf4j:slf4j-api:2.0.7") + implementation("org.slf4j:slf4j-api:2.0.9") api("com.esotericsoftware:kryo:5.5.0") { diff --git a/src/dorkbox/storage/Storage.kt b/src/dorkbox/storage/Storage.kt index 3876c2b..163c34e 100644 --- a/src/dorkbox/storage/Storage.kt +++ b/src/dorkbox/storage/Storage.kt @@ -20,15 +20,15 @@ import dorkbox.bytes.encodeToBase58String import dorkbox.storage.serializer.SerializerBytes import dorkbox.storage.types.MemoryStore import dorkbox.storage.types.PropertyStore -import mu.KLogger -import mu.KotlinLogging +import org.slf4j.Logger +import org.slf4j.LoggerFactory import org.slf4j.helpers.NOPLogger import java.io.File typealias AccessFunc = ((serializer: SerializerBytes, key: Any, value: Any?, load: (key: Any, value: Any?) -> Unit) -> Unit) -abstract class Storage(val logger: KLogger) : AutoCloseable { +abstract class Storage(val logger: Logger) : AutoCloseable { companion object { /** * Gets the version number. @@ -42,7 +42,7 @@ abstract class Storage(val logger: KLogger) : AutoCloseable { const val versionTag = "__VERSION__" - private val defaultLogger: KLogger = KotlinLogging.logger(NOPLogger.NOP_LOGGER) + private val defaultLogger: Logger = NOPLogger.NOP_LOGGER } fun init(initMessage: String) { @@ -51,7 +51,7 @@ abstract class Storage(val logger: KLogger) : AutoCloseable { setVersion(0L) } - KotlinLogging.logger("Storage").info(initMessage) + LoggerFactory.getLogger("Storage").info(initMessage) } /** @@ -165,7 +165,7 @@ abstract class Storage(val logger: KLogger) : AutoCloseable { /** * Assigns a logger to use for the storage system. The default is a No Operation (NOP) logger which will ignore everything. */ - fun logger(logger: KLogger): Builder + fun logger(logger: Logger): Builder } @@ -184,7 +184,7 @@ abstract class Storage(val logger: KLogger) : AutoCloseable { @Volatile var sharedBuild: Storage? = null - var logger: KLogger = defaultLogger + var logger: Logger = defaultLogger var file = File("storage.db") var readOnly = false @@ -224,7 +224,7 @@ abstract class Storage(val logger: KLogger) : AutoCloseable { return this } - override fun logger(logger: KLogger): B { + override fun logger(logger: Logger): B { this.logger = logger return this as B } @@ -304,7 +304,7 @@ abstract class Storage(val logger: KLogger) : AutoCloseable { * This storage system DOES NOT care about serializing data, so `register` has no effect. */ class Memory : Builder { - private var logger: KLogger = defaultLogger + private var logger: Logger = defaultLogger private var shared = false @Volatile private var sharedBuild: Storage? = null @@ -344,7 +344,7 @@ abstract class Storage(val logger: KLogger) : AutoCloseable { /** * Assigns a logger to use for the storage system. If null, then only errors will be logged to the error console. */ - override fun logger(logger: KLogger): Builder { + override fun logger(logger: Logger): Builder { this.logger = logger return this } diff --git a/src/dorkbox/storage/types/ChronicleMapStore.kt b/src/dorkbox/storage/types/ChronicleMapStore.kt index c4210dd..1633ddd 100644 --- a/src/dorkbox/storage/types/ChronicleMapStore.kt +++ b/src/dorkbox/storage/types/ChronicleMapStore.kt @@ -1,5 +1,5 @@ /* - * Copyright 2021 dorkbox, llc + * Copyright 2023 dorkbox, llc * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import com.esotericsoftware.kryo.io.ByteBufferOutput import com.esotericsoftware.kryo.io.Input import com.esotericsoftware.kryo.io.Output import dorkbox.storage.Storage -import mu.KLogger +import org.slf4j.Logger import java.io.File /** @@ -31,7 +31,7 @@ import java.io.File class ChronicleMapStore( val dbFile: File, val readOnly: Boolean, - logger: KLogger + logger: Logger ) : Storage(logger) { // private val map = ChronicleMap.of(String::class.java, ByteArray::class.java) diff --git a/src/dorkbox/storage/types/JsonStore.kt b/src/dorkbox/storage/types/JsonStore.kt index b55f74f..fb31c6b 100644 --- a/src/dorkbox/storage/types/JsonStore.kt +++ b/src/dorkbox/storage/types/JsonStore.kt @@ -19,7 +19,7 @@ import dorkbox.json.JsonException import dorkbox.json.OutputType import dorkbox.storage.AccessFunc import dorkbox.storage.Storage -import mu.KLogger +import org.slf4j.Logger import java.io.File import java.io.IOException import java.util.concurrent.* @@ -32,7 +32,7 @@ class JsonStore( val autoLoad: Boolean, val readOnly: Boolean, val readOnlyViolent: Boolean, - logger: KLogger, + logger: Logger, onLoad: AccessFunc, onSave: AccessFunc, ) : Storage(logger) { diff --git a/src/dorkbox/storage/types/LmdbStore.kt b/src/dorkbox/storage/types/LmdbStore.kt index 424f973..11b65ce 100644 --- a/src/dorkbox/storage/types/LmdbStore.kt +++ b/src/dorkbox/storage/types/LmdbStore.kt @@ -1,5 +1,5 @@ /* - * Copyright 2021 dorkbox, llc + * Copyright 2023 dorkbox, llc * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ package dorkbox.storage.types import dorkbox.storage.Storage -import mu.KLogger +import org.slf4j.Logger import java.io.File /** @@ -27,7 +27,7 @@ import java.io.File class LmdbStore( val dbFile: File, val readOnly: Boolean, - logger: KLogger + logger: Logger ) : Storage(logger) { // private val env: Env diff --git a/src/dorkbox/storage/types/MemoryStore.kt b/src/dorkbox/storage/types/MemoryStore.kt index 4eac15d..0b15f5d 100644 --- a/src/dorkbox/storage/types/MemoryStore.kt +++ b/src/dorkbox/storage/types/MemoryStore.kt @@ -1,5 +1,5 @@ /* - * Copyright 2021 dorkbox, llc + * Copyright 2023 dorkbox, llc * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,14 @@ package dorkbox.storage.types import dorkbox.storage.Storage -import mu.KLogger +import org.slf4j.Logger import java.io.File import java.util.concurrent.* /** * In-Memory storage */ -class MemoryStore(logger: KLogger) : Storage(logger) { +class MemoryStore(logger: Logger) : Storage(logger) { private val map = ConcurrentHashMap() init { diff --git a/src/dorkbox/storage/types/PropertyStore.kt b/src/dorkbox/storage/types/PropertyStore.kt index 83ca04b..5b75832 100644 --- a/src/dorkbox/storage/types/PropertyStore.kt +++ b/src/dorkbox/storage/types/PropertyStore.kt @@ -1,5 +1,5 @@ /* - * Copyright 2021 dorkbox, llc + * Copyright 2023 dorkbox, llc * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ package dorkbox.storage.types import dorkbox.storage.AccessFunc import dorkbox.storage.serializer.SerializerBytes -import mu.KLogger +import org.slf4j.Logger import java.io.File import java.io.FileInputStream import java.io.FileOutputStream @@ -31,7 +31,7 @@ class PropertyStore( autoLoad: Boolean, readOnly: Boolean, readOnlyViolent: Boolean, - logger: KLogger, + logger: Logger, serializer: SerializerBytes, onLoad: AccessFunc, onSave: AccessFunc, diff --git a/src/dorkbox/storage/types/StringStore.kt b/src/dorkbox/storage/types/StringStore.kt index a67f714..33c6b76 100644 --- a/src/dorkbox/storage/types/StringStore.kt +++ b/src/dorkbox/storage/types/StringStore.kt @@ -18,7 +18,7 @@ package dorkbox.storage.types import dorkbox.storage.AccessFunc import dorkbox.storage.Storage import dorkbox.storage.serializer.SerializerBytes -import mu.KLogger +import org.slf4j.Logger import java.io.File import java.io.IOException import java.util.concurrent.* @@ -31,7 +31,7 @@ abstract class StringStore( val autoLoad: Boolean, val readOnly: Boolean, val readOnlyViolent: Boolean, - logger: KLogger, + logger: Logger, val serializer: SerializerBytes, val onLoad: AccessFunc, val onSave: AccessFunc, diff --git a/src9/module-info.java b/src9/module-info.java index d1d5e8d..eec1d92 100644 --- a/src9/module-info.java +++ b/src9/module-info.java @@ -12,7 +12,6 @@ module dorkbox.storage { requires transitive com.esotericsoftware.kryo; requires transitive org.slf4j; - requires transitive io.github.microutils.kotlinlogging; requires transitive kotlin.stdlib; }