Merge pull request #27 from Astra-Interactive/update-klibs

update klibs

benchmarks/src/benchmarks/kotlin/ru/astrainteractive/aspekt/benchmarks/KtsTestBenchmark.kt

@@ -113,7 +113,7 @@ class KtsTestBenchmark {
     fun protoBufKrateBenchmark(): SomeObject = withTempFolder { currentFolder ->
         val initialValue = SomeObject()
         val krate = BinaryFormatKrate(
-            default = initialValue,
+            factory = initialValue,
             key = "proto_krate.proto",
             folder = currentFolder,
             binaryFormat = ProtoBuf,

core-bukkit/src/main/kotlin/ru/astrainteractive/astralibs/configuration/BukkitMutableStorageValue.kt

@@ -11,19 +11,19 @@ object BukkitMutableStorageValue {
         path: String
     ): StateFlowMutableStorageValue<T?> {
         return StateFlowMutableStorageValue(
-            default = null,
-            saveSettingsValue = { set(path, it) },
-            loadSettingsValue = { getObject(path, T::class.java).takeIf { contains(path) } }
+            factory = { null },
+            saver = { set(path, it) },
+            loader = { getObject(path, T::class.java).takeIf { contains(path) } }
         )
     }
 
     inline fun <reified T> FileConfiguration.anyMutableStorageValue(
         path: String
     ): MutableStorageValue<T?> {
         return MutableStorageValue(
-            default = null,
-            saveSettingsValue = { set(path, it) },
-            loadSettingsValue = { getObject(path, T::class.java).takeIf { contains(path) } }
+            factory = { null },
+            saver = { set(path, it) },
+            loader = { getObject(path, T::class.java).takeIf { contains(path) } }
         )
     }
 }

core-bukkit/src/test/java/ru/astrainteractive/astralibs/configuration/MutableStorageValueTest.kt

@@ -24,7 +24,7 @@ class MutableStorageValueTest {
             storageValue.reset()
             assertNull(storageValue.load())
             // Test withDefault value is as expected
-            assertEquals(expectedValue, storageValue.withDefault(expectedValue).load())
+            assertEquals(expectedValue, storageValue.withDefault { expectedValue }.load())
         }
     }
 

core/src/main/kotlin/ru/astrainteractive/astralibs/krate/core/BinaryFormatKrate.kt

@@ -2,16 +2,17 @@ package ru.astrainteractive.astralibs.krate.core
 
 import kotlinx.serialization.BinaryFormat
 import kotlinx.serialization.KSerializer
+import ru.astrainteractive.klibs.kstorage.api.value.ValueFactory
 import java.io.File
 
 class BinaryFormatKrate<T>(
     binaryFormat: BinaryFormat,
     kSerializer: KSerializer<T>,
-    default: T,
+    factory: ValueFactory<T>,
     key: String,
     folder: File,
 ) : FileKrate<T> by FileKrate.Default(
-    default = default,
+    factory = factory,
     fileName = key,
     folder = folder,
     save = save@{ file, value ->

core/src/main/kotlin/ru/astrainteractive/astralibs/krate/core/FileKrate.kt

@@ -2,6 +2,7 @@ package ru.astrainteractive.astralibs.krate.core
 
 import ru.astrainteractive.klibs.kstorage.MutableStorageValue
 import ru.astrainteractive.klibs.kstorage.api.MutableStorageValue
+import ru.astrainteractive.klibs.kstorage.api.value.ValueFactory
 import java.io.File
 
 /**
@@ -14,24 +15,24 @@ interface FileKrate<T> : MutableStorageValue<T> {
     val folder: File
 
     class Default<T>(
-        val default: T,
+        val factory: ValueFactory<T>,
         override val fileName: String,
         override val folder: File,
         save: (file: File, value: T) -> Unit,
         load: (file: File) -> T
     ) : FileKrate<T>,
         MutableStorageValue<T> by MutableStorageValue(
-            default = default,
-            saveSettingsValue = saveSettingsValue@{ value ->
+            factory = factory,
+            saver = saver@{ value ->
                 val file = File(folder, fileName)
                 file.parentFile.mkdirs()
                 file.createNewFile()
                 save.invoke(file, value)
             },
-            loadSettingsValue = loadSettingsValue@{
+            loader = loader@{
                 val file = File(folder, fileName)
-                if (!file.exists()) return@loadSettingsValue default
-                runCatching { load.invoke(file) }.getOrElse { default }
+                if (!file.exists()) return@loader factory.create()
+                runCatching { load.invoke(file) }.getOrElse { factory.create() }
             }
         )
 }

core/src/main/kotlin/ru/astrainteractive/astralibs/krate/core/JBinaryKrate.kt

@@ -2,16 +2,17 @@ package ru.astrainteractive.astralibs.krate.core
 
 import ru.astrainteractive.astralibs.encoding.encoder.ObjectEncoder
 import ru.astrainteractive.astralibs.encoding.model.EncodedObject
+import ru.astrainteractive.klibs.kstorage.api.value.ValueFactory
 import java.io.File
 import java.io.Serializable
 
 class JBinaryKrate<T : Serializable>(
-    default: T,
+    factory: ValueFactory<T>,
     objectEncoder: ObjectEncoder,
     fileName: String,
     folder: File,
 ) : FileKrate<T> by FileKrate.Default(
-    default = default,
+    factory = factory,
     folder = folder,
     fileName = fileName,
     save = save@{ file, value ->

core/src/main/kotlin/ru/astrainteractive/astralibs/krate/core/StringFormatKrate.kt

@@ -4,16 +4,17 @@ import kotlinx.serialization.KSerializer
 import kotlinx.serialization.StringFormat
 import ru.astrainteractive.astralibs.serialization.StringFormatExt.parse
 import ru.astrainteractive.astralibs.serialization.StringFormatExt.writeIntoFile
+import ru.astrainteractive.klibs.kstorage.api.value.ValueFactory
 import java.io.File
 
 class StringFormatKrate<T>(
     stringFormat: StringFormat,
     kSerializer: KSerializer<T>,
-    default: T,
+    factory: ValueFactory<T>,
     fileName: String,
     folder: File,
 ) : FileKrate<T> by FileKrate.Default(
-    default = default,
+    factory = factory,
     fileName = fileName,
     folder = folder,
     save = save@{ file, value ->

core/src/test/java/ru/astrainteractive/astralibs/krate/TextKrateTest.kt

@@ -5,6 +5,7 @@ import org.junit.Test
 import ru.astrainteractive.astralibs.krate.core.StringFormatKrate
 import ru.astrainteractive.astralibs.krate.util.KrateExt.delete
 import ru.astrainteractive.astralibs.serialization.YamlStringFormat
+import ru.astrainteractive.klibs.kstorage.update
 import java.io.File
 import java.util.UUID
 import kotlin.random.Random
@@ -36,7 +37,7 @@ class TextKrateTest {
         val storage = StringFormatKrate(
             stringFormat = serializer,
             kSerializer = TestStorage.serializer(),
-            default = initial,
+            factory = { initial },
             fileName = UUID.randomUUID().toString(),
             folder = folder
         )
@@ -55,7 +56,7 @@ class TextKrateTest {
         val storage = StringFormatKrate(
             stringFormat = YamlStringFormat(),
             kSerializer = TestStorage.serializer(),
-            default = initial,
+            factory = { initial },
             fileName = "yaml_test_file.yaml",
             folder = folder
         )

gradle.properties

@@ -7,7 +7,7 @@ makeevrserg.java.ktarget=21
 # Project
 makeevrserg.project.name=AstraLibs
 makeevrserg.project.group=ru.astrainteractive.astralibs
-makeevrserg.project.version.string=3.5.1
+makeevrserg.project.version.string=3.6.0
 makeevrserg.project.description=Core utilities for spigot development
 makeevrserg.project.developers=makeevrserg|Makeev Roman|makeevrserg@gmail.com
 makeevrserg.project.url=https://empireprojekt.ru

gradle/klibs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
 # klibs
-klibs-gradleplugin = "1.0.0-alpha03" # https://github.com/makeevrserg/gradle-plugin
-klibs-kstorage = "1.3.0" # https://github.com/makeevrserg/klibs.kstorage
-klibs-mikro = "1.6.0-beta" # https://github.com/makeevrserg/klibs.mikro
+klibs-gradleplugin = "1.1.1" # https://github.com/makeevrserg/gradle-plugin
+klibs-kstorage = "1.4.0" # https://github.com/makeevrserg/klibs.kstorage
+klibs-mikro = "1.7.0" # https://github.com/makeevrserg/klibs.mikro
 klibs-kdi = "1.3.2" # https://github.com/makeevrserg/klibs.kdi
 
 [libraries]