Revert "add Handlers subproject"

This reverts commit d1021d283a.

CHANGELOG.md

@@ -1,68 +1,6 @@
 # Changelog
 
-## 0.11.0
-
-## 0.10.8
-
-* `Common`
-    * Add `Element.isOverflow*` extension properties
-
-## 0.10.7
-
-* `Pagination`:
-    * Now it is possible to use `doForAll*` and `getForAll` functions in non suspend places
-
-## 0.10.6
-
-* `Versions`
-    * `Ktor`: `2.0.1` -> `2.0.2`
-* `Common`
-    * `JS`:
-        * Add `ResizeObserver` functionality
-
-## 0.10.5
-
-* `Versions`
-    * `Compose`: `1.2.0-alpha01-dev683` -> `1.2.0-alpha01-dev686`
-* `Repos`
-    * `Android`:
-        * New function `SharedPreferencesKeyValueRepo`
-* `FSM`
-    * Add `StateHandlingErrorHandler` and opportunity to handle states handling errors
-
-## 0.10.4
-
-* `Versions`:
-    * `Serialization`: `1.3.2` -> `1.3.3`
-
-## 0.10.3
-
-* `Versions`:
-    * `Compose`: `1.2.0-alpha01-dev682` -> `1.2.0-alpha01-dev683`
-* `Coroutines`:
-    * Fixes in `AccumulatorFlow`
-
-## 0.10.2
-
-* `Versions`:
-    * `Compose`: `1.2.0-alpha01-dev675` -> `1.2.0-alpha01-dev682`
-
-## 0.10.1
-
-* `Versions`:
-    * `Ktor`: `2.0.0` -> `2.0.1`
-* `Crypto`:
-    * Add `hmacSha256`
-    * Add `hex`
-
-## 0.10.0
-
-* `Versions`:
-    * `Kotlin`: `1.6.10` -> `1.6.21`
-    * `Compose`: `1.1.1` -> `1.2.0-alpha01-dev675`
-    * `Exposed`: `0.37.3` -> `0.38.2`
-    * `Ktor`: `1.6.8` -> `2.0.0`
-    * `Dokka`: `1.6.10` -> `1.6.21`
+## 0.9.25
 
 ## 0.9.24
 

build.gradle

@@ -21,7 +21,6 @@ allprojects {
         mavenLocal()
         mavenCentral()
         google()
-        maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" }
     }
 
     // temporal crutch until legacy tests will be stabled or legacy target will be removed

common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Annotations.kt

@@ -1,5 +1,3 @@
-@file:Suppress("OPT_IN_IS_NOT_ENABLED")
-
 package dev.inmo.micro_utils.common
 
 @RequiresOptIn(

common/src/commonMain/kotlin/dev/inmo/micro_utils/common/DiffUtils.kt

@@ -43,7 +43,6 @@ private inline fun <T> performChanges(
         if (oldOneEqualToNewObject || newOneEqualToOldObject) {
             changedList.addAll(
                 potentialChanges.take(i).mapNotNull {
-                    @Suppress("UNCHECKED_CAST")
                     if (it.first != null && it.second != null) it as Pair<IndexedValue<T>, IndexedValue<T>> else null
                 }
             )
@@ -122,10 +121,7 @@ fun <T> Iterable<T>.calculateDiff(
 
         when {
             oldObject === newObject || (oldObject == newObject && !strictComparison) -> {
-                changedObjects.addAll(potentiallyChangedObjects.map {
-                    @Suppress("UNCHECKED_CAST")
-                    it as Pair<IndexedValue<T>, IndexedValue<T>>
-                })
+                changedObjects.addAll(potentiallyChangedObjects.map { it as Pair<IndexedValue<T>, IndexedValue<T>> })
                 potentiallyChangedObjects.clear()
             }
             else -> {

common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Either.kt

@@ -27,13 +27,20 @@ sealed interface Either<T1, T2> {
     @Deprecated("Use optionalT2 instead", ReplaceWith("optionalT2"))
     val t2: T2?
         get() = optionalT2.dataOrNull()
+
+    companion object {
+        fun <T1, T2> serializer(
+            t1Serializer: KSerializer<T1>,
+            t2Serializer: KSerializer<T2>,
+        ): KSerializer<Either<T1, T2>> = EitherSerializer(t1Serializer, t2Serializer)
+    }
 }
 
 class EitherSerializer<T1, T2>(
     t1Serializer: KSerializer<T1>,
     t2Serializer: KSerializer<T2>,
 ) : KSerializer<Either<T1, T2>> {
-    @OptIn(InternalSerializationApi::class)
+    @OptIn(ExperimentalSerializationApi::class, InternalSerializationApi::class)
     override val descriptor: SerialDescriptor = buildSerialDescriptor(
         "TypedSerializer",
         SerialKind.CONTEXTUAL

common/src/commonTest/kotlin/dev/inmo/micro_utils/common/DiffUtilsTests.kt

@@ -32,7 +32,7 @@ class DiffUtilsTests {
         val withIndex = oldList.withIndex()
 
         for (count in 1 .. (floor(oldList.size.toFloat() / 2).toInt())) {
-            for ((i, _) in withIndex) {
+            for ((i, v) in withIndex) {
                 if (i + count > oldList.lastIndex) {
                     continue
                 }
@@ -55,7 +55,7 @@ class DiffUtilsTests {
         val withIndex = oldList.withIndex()
 
         for (step in oldList.indices) {
-            for ((i, _) in withIndex) {
+            for ((i, v) in withIndex) {
                 val mutable = oldList.toMutableList()
                 val changes = (
                     if (step == 0) i until oldList.size else (i until oldList.size step step)
@@ -104,7 +104,7 @@ class DiffUtilsTests {
         val withIndex = oldList.withIndex()
 
         for (count in 1 .. (floor(oldList.size.toFloat() / 2).toInt())) {
-            for ((i, _) in withIndex) {
+            for ((i, v) in withIndex) {
                 if (i + count > oldList.lastIndex) {
                     continue
                 }
@@ -129,20 +129,15 @@ class DiffUtilsTests {
         val withIndex = oldList.withIndex()
 
         for (step in oldList.indices) {
-            for ((i, _) in withIndex) {
+            for ((i, v) in withIndex) {
                 val mutable = oldList.toMutableList()
-
-                val newList = if (step == 0) {
-                    i until oldList.size
-                } else {
-                    i until oldList.size step step
-                }
-                newList.forEach { index ->
+                val changes = (
+                    if (step == 0) i until oldList.size else (i until oldList.size step step)
+                ).map { index ->
                     IndexedValue(index, mutable[index]) to IndexedValue(index, "changed$index").also {
                         mutable[index] = it.value
                     }
                 }
-
                 val mutableOldList = oldList.toMutableList()
                 mutableOldList.applyDiff(mutable)
                 assertEquals(

common/src/jsMain/kotlin/dev/inmo/micro_utils/common/IsOverflow.kt

@@ -1,12 +0,0 @@
-package dev.inmo.micro_utils.common
-
-import org.w3c.dom.Element
-
-inline val Element.isOverflowWidth
-    get() = scrollWidth > clientWidth
-
-inline val Element.isOverflowHeight
-    get() = scrollHeight > clientHeight
-
-inline val Element.isOverflow
-    get() = isOverflowHeight || isOverflowWidth

common/src/jsMain/kotlin/dev/inmo/micro_utils/common/ResizeObserver.kt

@@ -1,58 +0,0 @@
-package dev.inmo.micro_utils.common
-
-import org.w3c.dom.*
-import kotlin.js.Json
-import kotlin.js.json
-
-external class ResizeObserver(
-    callback: (Array<ResizeObserverEntry>, ResizeObserver) -> Unit
-) {
-    fun observe(target: Element, options: Json = definedExternally)
-
-    fun unobserve(target: Element)
-
-    fun disconnect()
-}
-
-external interface ResizeObserverSize {
-    val blockSize: Float
-    val inlineSize: Float
-}
-
-external interface ResizeObserverEntry {
-    val borderBoxSize: Array<ResizeObserverSize>
-    val contentBoxSize: Array<ResizeObserverSize>
-    val devicePixelContentBoxSize: Array<ResizeObserverSize>
-    val contentRect: DOMRectReadOnly
-    val target: Element
-}
-
-fun ResizeObserver.observe(target: Element, options: ResizeObserverObserveOptions) = observe(
-    target,
-    json(
-        "box" to options.box ?.name
-    )
-)
-
-class ResizeObserverObserveOptions(
-    val box: Box? = null
-) {
-    sealed interface Box {
-        val name: String
-
-        object Content : Box {
-            override val name: String
-                get() = "content-box"
-        }
-
-        object Border : Box {
-            override val name: String
-                get() = "border-box"
-        }
-
-        object DevicePixelContent : Box {
-            override val name: String
-                get() = "device-pixel-content-box"
-        }
-    }
-}

coroutines/compose/src/commonMain/kotlin/dev/inmo/micro_utils/coroutines/compose/FlowToState.kt

@@ -16,7 +16,6 @@ fun <T> Flow<T>.toMutableState(
     return state
 }
 
-@Suppress("NOTHING_TO_INLINE")
 inline fun <T> StateFlow<T>.toMutableState(
     scope: CoroutineScope
 ): MutableState<T> = toMutableState(value, scope)

coroutines/src/commonMain/kotlin/dev/inmo/micro_utils/coroutines/AccumulatorFlow.kt

@@ -6,12 +6,11 @@ import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import kotlin.coroutines.cancellation.CancellationException
 
-private sealed interface AccumulatorFlowStep<T>
-private data class DataRetrievedAccumulatorFlowStep<T>(val data: T) : AccumulatorFlowStep<T>
-private data class SubscribeAccumulatorFlowStep<T>(val channel: Channel<T>) : AccumulatorFlowStep<T>
-private data class UnsubscribeAccumulatorFlowStep<T>(val channel: Channel<T>) : AccumulatorFlowStep<T>
+private sealed interface AccumulatorFlowStep
+private data class DataRetrievedAccumulatorFlowStep(val data: Any) : AccumulatorFlowStep
+private data class SubscribeAccumulatorFlowStep(val channel: Channel<Any>) : AccumulatorFlowStep
+private data class UnsubscribeAccumulatorFlowStep(val channel: Channel<Any>) : AccumulatorFlowStep
 
 /**
  * This [Flow] will have behaviour very similar to [SharedFlow], but there are several differences:
@@ -27,12 +26,12 @@ class AccumulatorFlow<T>(
     private val subscope = scope.LinkedSupervisorScope()
     private val activeData = ArrayDeque<T>()
     private val dataMutex = Mutex()
-    private val channelsForBroadcast = mutableListOf<Channel<T>>()
+    private val channelsForBroadcast = mutableListOf<Channel<Any>>()
     private val channelsMutex = Mutex()
-    private val steps = subscope.actor<AccumulatorFlowStep<T>> { step ->
+    private val steps = subscope.actor<AccumulatorFlowStep> { step ->
         when (step) {
             is DataRetrievedAccumulatorFlowStep -> {
-                if (activeData.firstOrNull() === step.data) {
+                if (activeData.first() === step.data) {
                     dataMutex.withLock {
                         activeData.removeFirst()
                     }
@@ -43,7 +42,7 @@ class AccumulatorFlow<T>(
                 dataMutex.withLock {
                     val dataToSend = activeData.toList()
                     safelyWithoutExceptions {
-                        dataToSend.forEach { step.channel.send(it) }
+                        dataToSend.forEach { step.channel.send(it as Any) }
                     }
                 }
             }
@@ -59,29 +58,24 @@ class AccumulatorFlow<T>(
         channelsMutex.withLock {
             channelsForBroadcast.forEach { channel ->
                 safelyWithResult {
-                    channel.send(it)
+                    channel.send(it as Any)
                 }
             }
         }
     }
 
     override suspend fun collectSafely(collector: FlowCollector<T>) {
-        val channel = Channel<T>(Channel.UNLIMITED, BufferOverflow.SUSPEND)
+        val channel = Channel<Any>(Channel.UNLIMITED, BufferOverflow.SUSPEND)
         steps.send(SubscribeAccumulatorFlowStep(channel))
-        val result = runCatchingSafely {
-            for (data in channel) {
-                val emitResult = runCatchingSafely {
-                    collector.emit(data)
-                }
-                if (emitResult.isSuccess || emitResult.exceptionOrNull() is CancellationException) {
-                    steps.send(DataRetrievedAccumulatorFlowStep(data))
-                }
-                emitResult.getOrThrow()
+        for (data in channel) {
+            try {
+                collector.emit(data as T)
+                steps.send(DataRetrievedAccumulatorFlowStep(data))
+            } finally {
+                channel.cancel()
+                steps.send(UnsubscribeAccumulatorFlowStep(channel))
             }
         }
-        channel.cancel()
-        steps.send(UnsubscribeAccumulatorFlowStep(channel))
-        result.getOrThrow()
     }
 }
 

crypto/src/commonMain/kotlin/dev/inmo/micro_utils/crypto/Hex.kt

@@ -1,15 +0,0 @@
-package dev.inmo.micro_utils.crypto
-
-val HEX_ARRAY = "0123456789abcdef".toCharArray()
-
-fun SourceBytes.hex(): String {
-    val hexChars = CharArray(size * 2)
-    for (j in indices) {
-        val v: Int = this[j].toInt() and 0xFF
-        hexChars[j * 2] = HEX_ARRAY[v ushr 4]
-        hexChars[j * 2 + 1] = HEX_ARRAY[v and 0x0F]
-    }
-    return hexChars.concatToString()
-}
-
-fun SourceString.hex(): String = encodeToByteArray().hex()

crypto/src/commonMain/kotlin/dev/inmo/micro_utils/crypto/Sha.kt

@@ -1,3 +0,0 @@
-package dev.inmo.micro_utils.crypto
-
-expect fun SourceString.hmacSha256(key: String): String

crypto/src/commonTest/kotlin/dev/inmo/micro_utils/crypto/Hex.kt

@@ -1,15 +0,0 @@
-package dev.inmo.micro_utils.crypto
-
-import kotlin.test.*
-
-class Hex {
-    @Test
-    fun testSimpleHmacSHA256Message() {
-        val text = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-        val resultHex = text.hex()
-        assertEquals(
-            "4c6f72656d20697073756d20646f6c6f722073697420616d65742c20636f6e73656374657475722061646970697363696e6720656c69742c2073656420646f20656975736d6f642074656d706f7220696e6369646964756e74207574206c61626f726520657420646f6c6f7265206d61676e6120616c697175612e20557420656e696d206164206d696e696d2076656e69616d2c2071756973206e6f737472756420657865726369746174696f6e20756c6c616d636f206c61626f726973206e69736920757420616c697175697020657820656120636f6d6d6f646f20636f6e7365717561742e2044756973206175746520697275726520646f6c6f7220696e20726570726568656e646572697420696e20766f6c7570746174652076656c697420657373652063696c6c756d20646f6c6f726520657520667567696174206e756c6c612070617269617475722e204578636570746575722073696e74206f6363616563617420637570696461746174206e6f6e2070726f6964656e742c2073756e7420696e2063756c706120717569206f666669636961206465736572756e74206d6f6c6c697420616e696d20696420657374206c61626f72756d2e",
-            resultHex
-        )
-    }
-}

crypto/src/commonTest/kotlin/dev/inmo/micro_utils/crypto/HmacSHA256.kt

@@ -1,12 +0,0 @@
-package dev.inmo.micro_utils.crypto
-
-import kotlin.test.*
-
-class HmacSHA256 {
-    @Test
-    fun testSimpleHmacSHA256Message() {
-        val text = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-        val resultSha = text.hmacSha256("Example")
-        assertEquals("5a481d59329ef862b158eedc95392ebb22492ba3014661a3379d8201db992484", resultSha)
-    }
-}

crypto/src/jsMain/kotlin/dev/inmo/micro_utils/crypto/CryptoJs.kt

@@ -7,7 +7,3 @@ external interface CryptoJs {
 @JsModule("crypto-js")
 @JsNonModule
 external val CryptoJS: CryptoJs
-
-actual fun SourceString.hmacSha256(key: String): String {
-    return CryptoJS.asDynamic().HmacSHA256(this, key).toString().unsafeCast<String>()
-}

crypto/src/jvmMain/kotlin/dev/inmo/micro_utils/crypto/ShaHexActual.kt

@@ -1,13 +0,0 @@
-package dev.inmo.micro_utils.crypto
-
-import javax.crypto.Mac
-import javax.crypto.spec.SecretKeySpec
-
-actual fun SourceString.hmacSha256(key: String): String {
-    val mac = Mac.getInstance("HmacSHA256")
-
-    val secretKey = SecretKeySpec(key.toByteArray(), "HmacSHA256")
-    mac.init(secretKey)
-
-    return mac.doFinal(toByteArray()).hex()
-}

fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/StatesMachine.kt

@@ -3,8 +3,6 @@ package dev.inmo.micro_utils.fsm.common
 import dev.inmo.micro_utils.common.Optional
 import dev.inmo.micro_utils.common.onPresented
 import dev.inmo.micro_utils.coroutines.*
-import dev.inmo.micro_utils.fsm.common.utils.StateHandlingErrorHandler
-import dev.inmo.micro_utils.fsm.common.utils.defaultStateHandlingErrorHandler
 import kotlinx.coroutines.*
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
@@ -15,24 +13,13 @@ import kotlinx.coroutines.sync.withLock
  * handling until [start] method will be called
  */
 interface StatesMachine<T : State> : StatesHandler<T, T> {
-    suspend fun launchStateHandling(
-        state: T,
-        handlers: List<CheckableHandlerHolder<in T, T>>,
-        onStateHandlingErrorHandler: StateHandlingErrorHandler<T>
-    ): T? {
-        return runCatchingSafely {
-            handlers.firstOrNull { it.checkHandleable(state) } ?.run {
-                handleState(state)
-            }
-        }.getOrElse {
-            onStateHandlingErrorHandler(state, it)
-        }
-    }
     suspend fun launchStateHandling(
         state: T,
         handlers: List<CheckableHandlerHolder<in T, T>>
     ): T? {
-        return launchStateHandling(state, handlers, defaultStateHandlingErrorHandler())
+        return handlers.firstOrNull { it.checkHandleable(state) } ?.run {
+            handleState(state)
+        }
     }
 
     /**
@@ -51,9 +38,8 @@ interface StatesMachine<T : State> : StatesHandler<T, T> {
          */
         operator fun <T: State> invoke(
             statesManager: StatesManager<T>,
-            handlers: List<CheckableHandlerHolder<in T, T>>,
-            onStateHandlingErrorHandler: StateHandlingErrorHandler<T> = defaultStateHandlingErrorHandler()
-        ) = DefaultStatesMachine(statesManager, handlers, onStateHandlingErrorHandler)
+            handlers: List<CheckableHandlerHolder<in T, T>>
+        ) = DefaultStatesMachine(statesManager, handlers)
     }
 }
 
@@ -66,17 +52,12 @@ interface StatesMachine<T : State> : StatesHandler<T, T> {
 open class DefaultStatesMachine <T: State>(
     protected val statesManager: StatesManager<T>,
     protected val handlers: List<CheckableHandlerHolder<in T, T>>,
-    protected val onStateHandlingErrorHandler: StateHandlingErrorHandler<T> = defaultStateHandlingErrorHandler()
 ) : StatesMachine<T> {
     /**
      * Will call [launchStateHandling] for state handling
      */
     override suspend fun StatesMachine<in T>.handleState(state: T): T? = launchStateHandling(state, handlers)
 
-    override suspend fun launchStateHandling(state: T, handlers: List<CheckableHandlerHolder<in T, T>>): T? {
-        return launchStateHandling(state, handlers, onStateHandlingErrorHandler)
-    }
-
     /**
      * This
      */

fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/UpdatableStatesMachine.kt

@@ -1,8 +1,6 @@
 package dev.inmo.micro_utils.fsm.common
 
 import dev.inmo.micro_utils.common.*
-import dev.inmo.micro_utils.fsm.common.utils.StateHandlingErrorHandler
-import dev.inmo.micro_utils.fsm.common.utils.defaultStateHandlingErrorHandler
 import kotlinx.coroutines.*
 import kotlinx.coroutines.sync.withLock
 
@@ -22,11 +20,9 @@ interface UpdatableStatesMachine<T : State> : StatesMachine<T> {
 open class DefaultUpdatableStatesMachine<T : State>(
     statesManager: StatesManager<T>,
     handlers: List<CheckableHandlerHolder<in T, T>>,
-    onStateHandlingErrorHandler: StateHandlingErrorHandler<T> = defaultStateHandlingErrorHandler()
 ) : DefaultStatesMachine<T>(
     statesManager,
-    handlers,
-    onStateHandlingErrorHandler
+    handlers
 ), UpdatableStatesMachine<T> {
     protected val jobsStates = mutableMapOf<Job, T>()
 
@@ -38,7 +34,7 @@ open class DefaultUpdatableStatesMachine<T : State>(
      */
     override suspend fun performStateUpdate(previousState: Optional<T>, actualState: T, scope: CoroutineScope) {
         statesJobsMutex.withLock {
-            if (shouldReplaceJob(previousState, actualState)) {
+            if (compare(previousState, actualState)) {
                 statesJobs[actualState] ?.cancel()
             }
             val job = previousState.mapOnPresented {

fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/utils/StateHandlingErrorHandler.kt

@@ -1,6 +0,0 @@
-package dev.inmo.micro_utils.fsm.common.utils
-
-typealias StateHandlingErrorHandler<T> = suspend (T, Throwable) -> T?
-val DefaultStateHandlingErrorHandler: StateHandlingErrorHandler<*> = { _, _ -> null }
-inline fun <T> defaultStateHandlingErrorHandler(): StateHandlingErrorHandler<T> = DefaultStateHandlingErrorHandler as StateHandlingErrorHandler<T>
-

gradle.properties

@@ -14,5 +14,5 @@ crypto_js_version=4.1.1
 # Project data
 
 group=dev.inmo
-version=0.11.0
-android_code_version=124
+version=0.9.25
+android_code_version=115

gradle/libs.versions.toml

@@ -1,22 +1,22 @@
 [versions]
 
-kt = "1.6.21"
-kt-serialization = "1.3.3"
+kt = "1.6.10"
+kt-serialization = "1.3.2"
 kt-coroutines = "1.6.1"
 
-jb-compose = "1.2.0-alpha01-dev686"
-jb-exposed = "0.38.2"
-jb-dokka = "1.6.21"
+jb-compose = "1.1.1"
+jb-exposed = "0.37.3"
+jb-dokka = "1.6.10"
 
 klock = "2.7.0"
 uuid = "0.4.0"
 
-ktor = "2.0.2"
+ktor = "1.6.8"
 
-gh-release = "2.3.7"
+gh-release = "2.2.12"
 
 android-gradle = "7.0.4"
-dexcount = "3.1.0"
+dexcount = "3.0.1"
 
 android-coreKtx = "1.7.0"
 android-recyclerView = "1.2.1"
@@ -37,24 +37,15 @@ kt-serialization-cbor = { module = "org.jetbrains.kotlinx:kotlinx-serialization-
 
 kt-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kt-coroutines" }
 kt-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kt-coroutines" }
-kt-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kt-coroutines" }
 
 
 ktor-io = { module = "io.ktor:ktor-io", version.ref = "ktor" }
-ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }
 ktor-client = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
-ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
 ktor-client-java = { module = "io.ktor:ktor-client-java", version.ref = "ktor" }
-ktor-client-websockets = { module = "io.ktor:ktor-client-websockets", version.ref = "ktor" }
-ktor-client-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor" }
-ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" }
 ktor-server = { module = "io.ktor:ktor-server", version.ref = "ktor" }
 ktor-server-cio = { module = "io.ktor:ktor-server-cio", version.ref = "ktor" }
 ktor-server-host-common = { module = "io.ktor:ktor-server-host-common", version.ref = "ktor" }
 ktor-websockets = { module = "io.ktor:ktor-websockets", version.ref = "ktor" }
-ktor-server-websockets = { module = "io.ktor:ktor-server-websockets", version.ref = "ktor" }
-ktor-server-statusPages = { module = "io.ktor:ktor-server-status-pages", version.ref = "ktor" }
-ktor-server-content-negotiation = { module = "io.ktor:ktor-server-content-negotiation", version.ref = "ktor" }
 
 
 klock = { module = "com.soywiz.korlibs.klock:klock", version.ref = "klock" }

ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/client/FlowsWebsockets.kt

@@ -1,18 +1,14 @@
 package dev.inmo.micro_utils.ktor.client
 
-import dev.inmo.micro_utils.coroutines.runCatchingSafely
 import dev.inmo.micro_utils.coroutines.safely
 import dev.inmo.micro_utils.ktor.common.*
 import io.ktor.client.HttpClient
-import io.ktor.client.plugins.pluginOrNull
-import io.ktor.client.plugins.websocket.WebSockets
-import io.ktor.client.plugins.websocket.ws
+import io.ktor.client.features.websocket.ws
 import io.ktor.client.request.HttpRequestBuilder
-import io.ktor.websocket.Frame
-import io.ktor.websocket.readBytes
+import io.ktor.http.cio.websocket.Frame
+import io.ktor.http.cio.websocket.readBytes
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.channelFlow
-import kotlinx.coroutines.isActive
 import kotlinx.serialization.DeserializationStrategy
 
 /**
@@ -21,41 +17,43 @@ import kotlinx.serialization.DeserializationStrategy
  */
 inline fun <T> HttpClient.createStandardWebsocketFlow(
     url: String,
-    crossinline checkReconnection: suspend (Throwable?) -> Boolean = { true },
+    crossinline checkReconnection: (Throwable?) -> Boolean = { true },
     noinline requestBuilder: HttpRequestBuilder.() -> Unit = {},
     crossinline conversation: suspend (StandardKtorSerialInputData) -> T
 ): Flow<T> {
-    pluginOrNull(WebSockets) ?: error("Plugin $WebSockets must be installed for using createStandardWebsocketFlow")
-
     val correctedUrl = url.asCorrectWebSocketUrl
 
     return channelFlow {
+        val producerScope = this@channelFlow
         do {
-            val reconnect = runCatchingSafely {
-                ws(correctedUrl, requestBuilder) {
-                    for (received in incoming) {
-                        when (received) {
-                            is Frame.Binary -> send(conversation(received.data))
-                            else -> {
-                                close()
-                                return@ws
+            val reconnect = try {
+                safely {
+                    ws(correctedUrl, requestBuilder) {
+                        for (received in incoming) {
+                            when (received) {
+                                is Frame.Binary -> producerScope.send(conversation(received.readBytes()))
+                                else -> {
+                                    producerScope.close()
+                                    return@ws
+                                }
                             }
                         }
                     }
                 }
                 checkReconnection(null)
-            }.getOrElse { e ->
+            } catch (e: Throwable) {
                 checkReconnection(e).also {
                     if (!it) {
-                        close(e)
+                        producerScope.close(e)
                     }
                 }
             }
-        } while (reconnect && isActive)
-
-        if (isActive) {
-            safely {
-                close()
+        } while (reconnect)
+        if (!producerScope.isClosedForSend) {
+            safely(
+                { it.printStackTrace() }
+            ) {
+                producerScope.close()
             }
         }
     }
@@ -67,8 +65,8 @@ inline fun <T> HttpClient.createStandardWebsocketFlow(
  */
 inline fun <T> HttpClient.createStandardWebsocketFlow(
     url: String,
+    crossinline checkReconnection: (Throwable?) -> Boolean = { true },
     deserializer: DeserializationStrategy<T>,
-    crossinline checkReconnection: suspend (Throwable?) -> Boolean = { true },
     serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat,
     noinline requestBuilder: HttpRequestBuilder.() -> Unit = {},
 ) = createStandardWebsocketFlow(

ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/client/NewFlowsWebsockets.kt

@@ -1,55 +0,0 @@
-package dev.inmo.micro_utils.ktor.client
-
-import dev.inmo.micro_utils.coroutines.runCatchingSafely
-import dev.inmo.micro_utils.coroutines.safely
-import dev.inmo.micro_utils.ktor.common.*
-import io.ktor.client.HttpClient
-import io.ktor.client.plugins.pluginOrNull
-import io.ktor.client.plugins.websocket.*
-import io.ktor.client.request.HttpRequestBuilder
-import io.ktor.websocket.Frame
-import io.ktor.websocket.readBytes
-import io.ktor.websocket.serialization.sendSerializedBase
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.channelFlow
-import kotlinx.coroutines.isActive
-import kotlinx.serialization.DeserializationStrategy
-
-/**
- * @param checkReconnection This lambda will be called when it is required to reconnect to websocket to establish
- * connection. Must return true in case if must be reconnected. By default always reconnecting
- */
-inline fun <reified T> HttpClient.createStandardWebsocketFlow(
-    url: String,
-    noinline checkReconnection: suspend (Throwable?) -> Boolean = { true },
-    noinline requestBuilder: HttpRequestBuilder.() -> Unit = {}
-): Flow<T> {
-    pluginOrNull(WebSockets) ?: error("Plugin $WebSockets must be installed for using createStandardWebsocketFlow")
-
-    val correctedUrl = url.asCorrectWebSocketUrl
-
-    return channelFlow {
-        do {
-            val reconnect = runCatchingSafely {
-                ws(correctedUrl, requestBuilder) {
-                    for (received in incoming) {
-                        sendSerialized(received.data)
-                    }
-                }
-                checkReconnection(null)
-            }.getOrElse { e ->
-                checkReconnection(e).also {
-                    if (!it) {
-                        close(e)
-                    }
-                }
-            }
-        } while (reconnect && isActive)
-
-        if (isActive) {
-            safely {
-                close()
-            }
-        }
-    }
-}

ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/client/StandardHttpClientGetPost.kt

@@ -4,10 +4,8 @@ import dev.inmo.micro_utils.common.MPPFile
 import dev.inmo.micro_utils.common.filename
 import dev.inmo.micro_utils.ktor.common.*
 import io.ktor.client.HttpClient
-import io.ktor.client.call.body
 import io.ktor.client.request.*
 import io.ktor.client.request.forms.*
-import io.ktor.client.statement.readBytes
 import io.ktor.http.*
 import io.ktor.utils.io.core.ByteReadPacket
 import kotlinx.serialization.*
@@ -87,16 +85,16 @@ class UnifiedRequester(
 
     fun <T> createStandardWebsocketFlow(
         url: String,
-        checkReconnection: suspend (Throwable?) -> Boolean,
+        checkReconnection: (Throwable?) -> Boolean,
         deserializer: DeserializationStrategy<T>,
         requestBuilder: HttpRequestBuilder.() -> Unit = {},
-    ) = client.createStandardWebsocketFlow(url, deserializer, checkReconnection, serialFormat, requestBuilder)
+    ) = client.createStandardWebsocketFlow(url, checkReconnection, deserializer, serialFormat, requestBuilder)
 
     fun <T> createStandardWebsocketFlow(
         url: String,
         deserializer: DeserializationStrategy<T>,
         requestBuilder: HttpRequestBuilder.() -> Unit = {},
-    ) = createStandardWebsocketFlow(url, { true }, deserializer, requestBuilder)
+    ) = createStandardWebsocketFlow(url, { true  }, deserializer, requestBuilder)
 }
 
 val defaultRequester = UnifiedRequester()
@@ -105,8 +103,10 @@ suspend fun <ResultType> HttpClient.uniget(
     url: String,
     resultDeserializer: DeserializationStrategy<ResultType>,
     serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat
-) = get(url).let {
-    serialFormat.decodeDefault(resultDeserializer, it.body<StandardKtorSerialInputData>())
+) = get<StandardKtorSerialInputData>(
+    url
+).let {
+    serialFormat.decodeDefault(resultDeserializer, it)
 }
 
 
@@ -123,12 +123,10 @@ suspend fun <BodyType, ResultType> HttpClient.unipost(
     bodyInfo: BodyPair<BodyType>,
     resultDeserializer: DeserializationStrategy<ResultType>,
     serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat
-) = post(url) {
-    setBody(
-        serialFormat.encodeDefault(bodyInfo.first, bodyInfo.second)
-    )
+) = post<StandardKtorSerialInputData>(url) {
+    body = serialFormat.encodeDefault(bodyInfo.first, bodyInfo.second)
 }.let {
-    serialFormat.decodeDefault(resultDeserializer, it.body<StandardKtorSerialInputData>())
+    serialFormat.decodeDefault(resultDeserializer, it)
 }
 
 suspend fun <ResultType> HttpClient.unimultipart(
@@ -141,7 +139,7 @@ suspend fun <ResultType> HttpClient.unimultipart(
     dataHeadersBuilder: HeadersBuilder.() -> Unit = {},
     requestBuilder: HttpRequestBuilder.() -> Unit = {},
     serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat
-): ResultType = submitFormWithBinaryData(
+): ResultType = submitFormWithBinaryData<StandardKtorSerialInputData>(
     url,
     formData = formData {
         append(
@@ -157,7 +155,7 @@ suspend fun <ResultType> HttpClient.unimultipart(
     }
 ) {
     requestBuilder()
-}.let { serialFormat.decodeDefault(resultDeserializer, it.body<StandardKtorSerialInputData>()) }
+}.let { serialFormat.decodeDefault(resultDeserializer, it) }
 
 suspend fun <BodyType, ResultType> HttpClient.unimultipart(
     url: String,

ktor/client/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/client/ActualTemporalUpload.kt

@@ -4,10 +4,9 @@ import dev.inmo.micro_utils.common.MPPFile
 import dev.inmo.micro_utils.common.filename
 import dev.inmo.micro_utils.ktor.common.TemporalFileId
 import io.ktor.client.HttpClient
-import io.ktor.client.plugins.onUpload
+import io.ktor.client.features.onUpload
 import io.ktor.client.request.forms.formData
 import io.ktor.client.request.forms.submitFormWithBinaryData
-import io.ktor.client.statement.bodyAsText
 import io.ktor.http.Headers
 import io.ktor.http.HttpHeaders
 import java.net.URLConnection
@@ -21,7 +20,7 @@ actual suspend fun HttpClient.tempUpload(
     onUpload: (Long, Long) -> Unit
 ): TemporalFileId {
     val inputProvider = file.inputProvider()
-    val fileId = submitFormWithBinaryData(
+    val fileId = submitFormWithBinaryData<String>(
         fullTempUploadDraftPath,
         formData = formData {
             append(
@@ -35,6 +34,6 @@ actual suspend fun HttpClient.tempUpload(
         }
     ) {
         onUpload(onUpload)
-    }.bodyAsText()
+    }
     return TemporalFileId(fileId)
 }

ktor/common/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/common/StandardSerializer.kt

@@ -1,5 +1,3 @@
-@file:Suppress("NOTHING_TO_INLINE")
-
 package dev.inmo.micro_utils.ktor.common
 
 import kotlinx.serialization.*

ktor/server/build.gradle

@@ -19,8 +19,7 @@ kotlin {
                 api libs.ktor.server
                 api libs.ktor.server.cio
                 api libs.ktor.server.host.common
-                api libs.ktor.server.websockets
-                api libs.ktor.server.statusPages
+                api libs.ktor.websockets
             }
         }
     }

ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/FlowsWebsocket.kt

@@ -2,26 +2,26 @@ package dev.inmo.micro_utils.ktor.server
 
 import dev.inmo.micro_utils.coroutines.safely
 import dev.inmo.micro_utils.ktor.common.*
+import io.ktor.application.featureOrNull
+import io.ktor.application.install
 import io.ktor.http.URLProtocol
-import io.ktor.server.application.install
-import io.ktor.server.application.pluginOrNull
-import io.ktor.server.routing.Route
-import io.ktor.server.routing.application
-import io.ktor.server.websocket.*
-import io.ktor.websocket.send
+import io.ktor.http.cio.websocket.*
+import io.ktor.routing.Route
+import io.ktor.routing.application
+import io.ktor.websocket.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.serialization.SerializationStrategy
 
 fun <T> Route.includeWebsocketHandling(
     suburl: String,
     flow: Flow<T>,
-    protocol: URLProtocol? = null,
+    protocol: URLProtocol = URLProtocol.WS,
     converter: suspend WebSocketServerSession.(T) -> StandardKtorSerialInputData?
 ) {
     application.apply {
-        pluginOrNull(WebSockets) ?: install(WebSockets)
+        featureOrNull(io.ktor.websocket.WebSockets) ?: install(io.ktor.websocket.WebSockets)
     }
-    webSocket(suburl, protocol ?.name) {
+    webSocket(suburl, protocol.name) {
         safely {
             flow.collect {
                 converter(it) ?.let { data ->
@@ -37,7 +37,7 @@ fun <T> Route.includeWebsocketHandling(
     flow: Flow<T>,
     serializer: SerializationStrategy<T>,
     serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat,
-    protocol: URLProtocol? = null,
+    protocol: URLProtocol = URLProtocol.WS,
     filter: (suspend WebSocketServerSession.(T) -> Boolean)? = null
 ) = includeWebsocketHandling(
     suburl,

ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/NewFlowsWebsocket.kt

@@ -1,30 +0,0 @@
-package dev.inmo.micro_utils.ktor.server
-
-import dev.inmo.micro_utils.coroutines.safely
-import dev.inmo.micro_utils.ktor.common.*
-import io.ktor.http.URLProtocol
-import io.ktor.server.application.install
-import io.ktor.server.application.pluginOrNull
-import io.ktor.server.routing.Route
-import io.ktor.server.routing.application
-import io.ktor.server.websocket.*
-import io.ktor.websocket.send
-import kotlinx.coroutines.flow.Flow
-import kotlinx.serialization.SerializationStrategy
-
-inline fun <reified T : Any> Route.includeWebsocketHandling(
-    suburl: String,
-    flow: Flow<T>,
-    protocol: URLProtocol? = null
-) {
-    application.apply {
-        pluginOrNull(WebSockets) ?: install(WebSockets)
-    }
-    webSocket(suburl, protocol ?.name) {
-        safely {
-            flow.collect {
-                sendSerialized(it)
-            }
-        }
-    }
-}

ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/ServerRoutingShortcuts.kt

@@ -3,21 +3,25 @@ package dev.inmo.micro_utils.ktor.server
 import dev.inmo.micro_utils.common.*
 import dev.inmo.micro_utils.coroutines.safely
 import dev.inmo.micro_utils.ktor.common.*
+import io.ktor.application.ApplicationCall
+import io.ktor.application.call
 import io.ktor.http.*
-import io.ktor.http.content.*
-import io.ktor.server.application.ApplicationCall
-import io.ktor.server.application.call
-import io.ktor.server.request.receive
-import io.ktor.server.request.receiveMultipart
-import io.ktor.server.response.respond
-import io.ktor.server.response.respondBytes
-import io.ktor.server.routing.Route
-import io.ktor.server.websocket.WebSocketServerSession
+import io.ktor.http.content.PartData
+import io.ktor.http.content.forEachPart
+import io.ktor.request.receive
+import io.ktor.request.receiveMultipart
+import io.ktor.response.respond
+import io.ktor.response.respondBytes
+import io.ktor.routing.Route
+import io.ktor.util.asStream
+import io.ktor.util.cio.writeChannel
 import io.ktor.util.pipeline.PipelineContext
 import io.ktor.utils.io.core.*
+import io.ktor.websocket.WebSocketServerSession
 import kotlinx.coroutines.flow.Flow
-import kotlinx.serialization.DeserializationStrategy
-import kotlinx.serialization.SerializationStrategy
+import kotlinx.serialization.*
+import java.io.File
+import java.io.File.createTempFile
 
 class UnifiedRouter(
     val serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat,
@@ -27,7 +31,7 @@ class UnifiedRouter(
         suburl: String,
         flow: Flow<T>,
         serializer: SerializationStrategy<T>,
-        protocol: URLProtocol? = null,
+        protocol: URLProtocol = URLProtocol.WS,
         filter: (suspend WebSocketServerSession.(T) -> Boolean)? = null
     ) = includeWebsocketHandling(suburl, flow, serializer, serialFormat, protocol, filter)
 
@@ -193,9 +197,7 @@ suspend fun <T> ApplicationCall.uniloadMultipartFile(
                             ".${name.extension}"
                         ).apply {
                             outputStream().use { fileStream ->
-                                it.streamProvider().use {
-                                    it.copyTo(fileStream)
-                                }
+                                it.provider().asStream().copyTo(fileStream)
                             }
                         }
                     }
@@ -237,9 +239,7 @@ suspend fun ApplicationCall.uniloadMultipartFile(
                         ".${name.extension}"
                     ).apply {
                         outputStream().use { fileStream ->
-                            it.streamProvider().use {
-                                it.copyTo(fileStream)
-                            }
+                            it.provider().asStream().copyTo(fileStream)
                         }
                     }
                 } else {

ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/StartServer.kt

@@ -1,7 +1,7 @@
 package dev.inmo.micro_utils.ktor.server
 
 import dev.inmo.micro_utils.ktor.server.configurators.KtorApplicationConfigurator
-import io.ktor.server.application.Application
+import io.ktor.application.Application
 import io.ktor.server.cio.CIO
 import io.ktor.server.cio.CIOApplicationEngine
 import io.ktor.server.engine.*

ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/TemporalFilesRoutingConfigurator.kt

@@ -7,14 +7,14 @@ import dev.inmo.micro_utils.coroutines.launchSafelyWithoutExceptions
 import dev.inmo.micro_utils.ktor.common.DefaultTemporalFilesSubPath
 import dev.inmo.micro_utils.ktor.common.TemporalFileId
 import dev.inmo.micro_utils.ktor.server.configurators.ApplicationRoutingConfigurator
+import io.ktor.application.call
 import io.ktor.http.HttpStatusCode
 import io.ktor.http.content.PartData
 import io.ktor.http.content.streamProvider
-import io.ktor.server.application.call
-import io.ktor.server.request.receiveMultipart
-import io.ktor.server.response.respond
-import io.ktor.server.routing.Route
-import io.ktor.server.routing.post
+import io.ktor.request.receiveMultipart
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import io.ktor.routing.post
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.sync.Mutex

ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/configurators/ApplicationCachingHeadersConfigurator.kt

@@ -1,15 +1,14 @@
 package dev.inmo.micro_utils.ktor.server.configurators
 
-import io.ktor.server.application.Application
-import io.ktor.server.application.install
-import io.ktor.server.plugins.cachingheaders.CachingHeaders
-import io.ktor.server.plugins.cachingheaders.CachingHeadersConfig
+import io.ktor.application.Application
+import io.ktor.application.install
+import io.ktor.features.CachingHeaders
 import kotlinx.serialization.Contextual
 
 data class ApplicationCachingHeadersConfigurator(
     private val elements: List<@Contextual Element>
 ) : KtorApplicationConfigurator {
-    fun interface Element { operator fun CachingHeadersConfig.invoke() }
+    fun interface Element { operator fun CachingHeaders.Configuration.invoke() }
 
     override fun Application.configure() {
         install(CachingHeaders) {

ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/configurators/ApplicationRoutingConfigurator.kt

@@ -1,9 +1,8 @@
 package dev.inmo.micro_utils.ktor.server.configurators
 
-import dev.inmo.micro_utils.ktor.server.configurators.ApplicationRoutingConfigurator.Element
-import io.ktor.server.application.*
-import io.ktor.server.routing.Route
-import io.ktor.server.routing.Routing
+import io.ktor.application.*
+import io.ktor.routing.Route
+import io.ktor.routing.Routing
 import kotlinx.serialization.Contextual
 import kotlinx.serialization.Serializable
 
@@ -19,7 +18,7 @@ class ApplicationRoutingConfigurator(
     }
 
     override fun Application.configure() {
-        pluginOrNull(Routing) ?.apply {
+        featureOrNull(Routing) ?.apply {
             rootInstaller.apply { invoke() }
         } ?: install(Routing) {
             rootInstaller.apply { invoke() }

ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/configurators/ApplicationSessionsConfigurator.kt

@@ -1,15 +1,14 @@
 package dev.inmo.micro_utils.ktor.server.configurators
 
-import io.ktor.server.application.Application
-import io.ktor.server.application.install
-import io.ktor.server.sessions.Sessions
-import io.ktor.server.sessions.SessionsConfig
+import io.ktor.application.Application
+import io.ktor.application.install
+import io.ktor.sessions.Sessions
 import kotlinx.serialization.Contextual
 
 class ApplicationSessionsConfigurator(
     private val elements: List<@Contextual Element>
 ) : KtorApplicationConfigurator {
-    fun interface Element { operator fun SessionsConfig.invoke() }
+    fun interface Element { operator fun Sessions.Configuration.invoke() }
 
     override fun Application.configure() {
         install(Sessions) {

ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/configurators/KtorApplicationConfigurator.kt

@@ -1,6 +1,6 @@
 package dev.inmo.micro_utils.ktor.server.configurators
 
-import io.ktor.server.application.Application
+import io.ktor.application.Application
 
 interface KtorApplicationConfigurator {
     fun Application.configure()

ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/configurators/StatusPagesConfigurator.kt

@@ -1,15 +1,14 @@
 package dev.inmo.micro_utils.ktor.server.configurators
 
-import io.ktor.server.application.Application
-import io.ktor.server.application.install
-import io.ktor.server.plugins.statuspages.StatusPages
-import io.ktor.server.plugins.statuspages.StatusPagesConfig
+import io.ktor.application.Application
+import io.ktor.application.install
+import io.ktor.features.StatusPages
 import kotlinx.serialization.Contextual
 
 class StatusPagesConfigurator(
     private val elements: List<@Contextual Element>
 ) : KtorApplicationConfigurator {
-    fun interface Element { operator fun StatusPagesConfig.invoke() }
+    fun interface Element { operator fun StatusPages.Configuration.invoke() }
 
     override fun Application.configure() {
         install(StatusPages) {

language_codes/generator/src/main/kotlin/Main.kt

@@ -1,6 +1,5 @@
 import io.ktor.client.HttpClient
 import io.ktor.client.request.get
-import io.ktor.client.statement.bodyAsText
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.builtins.ListSerializer
@@ -165,7 +164,7 @@ suspend fun main(vararg args: String) {
 
     val ietfLanguageCodes = json.decodeFromString(
         ListSerializer(LanguageCode.serializer()),
-        client.get(ietfLanguageCodesLink).bodyAsText()
+        client.get(ietfLanguageCodesLink)
     ).map {
         it.copy(
             title = it.title
@@ -176,7 +175,7 @@ suspend fun main(vararg args: String) {
     }
     val ietfLanguageCodesWithTagsMap = json.decodeFromString(
         ListSerializer(LanguageCodeWithTag.serializer()),
-        client.get(ietfLanguageCodesAdditionalTagsLink).bodyAsText()
+        client.get(ietfLanguageCodesAdditionalTagsLink)
     ).filter { it.withSubtag != it.tag }.groupBy { it.tag }
 
     val tags = ietfLanguageCodes.map {

mime_types/src/commonMain/kotlin/dev/inmo/micro_utils/mime_types/MimeTypeTools.kt

@@ -1,6 +1,7 @@
 package dev.inmo.micro_utils.mime_types
 
-import kotlinx.serialization.*
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
 import kotlinx.serialization.descriptors.*
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
@@ -15,7 +16,6 @@ fun mimeType(raw: String) = mimesCache.getOrPut(raw) {
 
 internal fun parseMimeType(raw: String): MimeType = CustomMimeType(raw)
 
-@Suppress("OPT_IN_USAGE")
 @Serializer(MimeType::class)
 object MimeTypeSerializer : KSerializer<MimeType> {
     override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("mimeType", PrimitiveKind.STRING)

pagination/common/src/commonMain/kotlin/dev/inmo/micro_utils/pagination/WalkPagination.kt

@@ -27,5 +27,4 @@ inline fun <T> PaginationResult<T>.thisPageIfNotEmpty(): PaginationResult<T>? =
     null
 }
 
-@Suppress("NOTHING_TO_INLINE")
 inline fun <T> PaginationResult<T>.currentPageIfNotEmpty() = thisPageIfNotEmpty()

pagination/common/src/commonMain/kotlin/dev/inmo/micro_utils/pagination/utils/DoForAll.kt

@@ -2,19 +2,19 @@ package dev.inmo.micro_utils.pagination.utils
 
 import dev.inmo.micro_utils.pagination.*
 
-inline fun <T> doForAll(
+suspend fun <T> doForAll(
     initialPagination: Pagination = FirstPagePagination(),
     paginationMapper: (PaginationResult<T>) -> Pagination?,
-    block: (Pagination) -> PaginationResult<T>
+    block: suspend (Pagination) -> PaginationResult<T>
 ) {
     doWithPagination(initialPagination) {
         block(it).let(paginationMapper)
     }
 }
 
-inline fun <T> doForAllWithNextPaging(
+suspend fun <T> doForAllWithNextPaging(
     initialPagination: Pagination = FirstPagePagination(),
-    block: (Pagination) -> PaginationResult<T>
+    block: suspend (Pagination) -> PaginationResult<T>
 ) {
     doForAll(
         initialPagination,
@@ -23,9 +23,9 @@ inline fun <T> doForAllWithNextPaging(
     )
 }
 
-inline fun <T> doAllWithCurrentPaging(
+suspend fun <T> doAllWithCurrentPaging(
     initialPagination: Pagination = FirstPagePagination(),
-    block: (Pagination) -> PaginationResult<T>
+    block: suspend (Pagination) -> PaginationResult<T>
 ) {
     doForAll(
         initialPagination,
@@ -34,7 +34,7 @@ inline fun <T> doAllWithCurrentPaging(
     )
 }
 
-inline fun <T> doForAllWithCurrentPaging(
+suspend fun <T> doForAllWithCurrentPaging(
     initialPagination: Pagination = FirstPagePagination(),
-    block: (Pagination) -> PaginationResult<T>
+    block: suspend (Pagination) -> PaginationResult<T>
 ) = doAllWithCurrentPaging(initialPagination, block)

pagination/common/src/commonMain/kotlin/dev/inmo/micro_utils/pagination/utils/GetAll.kt

@@ -2,10 +2,10 @@ package dev.inmo.micro_utils.pagination.utils
 
 import dev.inmo.micro_utils.pagination.*
 
-inline fun <T> getAll(
+suspend fun <T> getAll(
     initialPagination: Pagination = FirstPagePagination(),
     paginationMapper: (PaginationResult<T>) -> Pagination?,
-    block: (Pagination) -> PaginationResult<T>
+    block: suspend (Pagination) -> PaginationResult<T>
 ): List<T> {
     val results = mutableListOf<T>()
     doForAll(initialPagination, paginationMapper) {
@@ -16,45 +16,46 @@ inline fun <T> getAll(
     return results.toList()
 }
 
-inline fun <T, R> R.getAllBy(
+suspend fun <T, R> R.getAllBy(
     initialPagination: Pagination = FirstPagePagination(),
     paginationMapper: R.(PaginationResult<T>) -> Pagination?,
-    block: R.(Pagination) -> PaginationResult<T>
+    block: suspend R.(Pagination) -> PaginationResult<T>
 ): List<T> = getAll(
     initialPagination,
     { paginationMapper(it) },
     { block(it) }
 )
 
-inline fun <T> getAllWithNextPaging(
+suspend fun <T> getAllWithNextPaging(
     initialPagination: Pagination = FirstPagePagination(),
-    block: (Pagination) -> PaginationResult<T>
+    block: suspend (Pagination) -> PaginationResult<T>
 ): List<T> = getAll(
     initialPagination,
     { it.nextPageIfNotEmpty() },
     block
 )
 
-inline fun <T, R> R.getAllByWithNextPaging(
+suspend fun <T, R> R.getAllByWithNextPaging(
     initialPagination: Pagination = FirstPagePagination(),
-    block: R.(Pagination) -> PaginationResult<T>
+    block: suspend R.(Pagination) -> PaginationResult<T>
 ): List<T> = getAllWithNextPaging(
     initialPagination,
     { block(it) }
 )
 
-inline fun <T> getAllWithCurrentPaging(
+suspend fun <T> getAllWithCurrentPaging(
     initialPagination: Pagination = FirstPagePagination(),
-    block: (Pagination) -> PaginationResult<T>
+    block: suspend (Pagination) -> PaginationResult<T>
 ): List<T> = getAll(
     initialPagination,
     { it.currentPageIfNotEmpty() },
     block
 )
 
-inline fun <T, R> R.getAllByWithCurrentPaging(
+suspend fun <T, R> R.getAllByWithCurrentPaging(
     initialPagination: Pagination = FirstPagePagination(),
-    block: R.(Pagination) -> PaginationResult<T>
+    block: suspend R.(Pagination) -> PaginationResult<T>
 ): List<T> = getAllWithCurrentPaging(
-    initialPagination
-) { block(it) }
+    initialPagination,
+    { block(it) }
+)

pagination/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/pagination/ServerPaginationHelpers.kt

@@ -1,7 +1,7 @@
 package dev.inmo.micro_utils.pagination
 
+import io.ktor.application.ApplicationCall
 import io.ktor.http.Parameters
-import io.ktor.server.application.ApplicationCall
 
 val Parameters.extractPagination: Pagination
     get() = SimplePagination(

repos/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/MapperRepo.kt

@@ -1,6 +1,5 @@
 package dev.inmo.micro_utils.repos
 
-@Suppress("UNCHECKED_CAST")
 interface MapperRepo<FromKey, FromValue, ToKey, ToValue> {
     suspend fun FromKey.toOutKey() = this as ToKey
     suspend fun FromValue.toOutValue() = this as ToValue

repos/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/StandartCRUDRepo.kt

@@ -42,11 +42,4 @@ suspend fun <ObjectType, IdType, InputValueType> WriteStandardCRUDRepo<ObjectTyp
 
 interface StandardCRUDRepo<ObjectType, IdType, InputValueType> : ReadStandardCRUDRepo<ObjectType, IdType>,
     WriteStandardCRUDRepo<ObjectType, IdType, InputValueType>
-typealias CRUDRepo<ObjectType, IdType, InputValueType> = StandardCRUDRepo<ObjectType, IdType, InputValueType>
-
-class DelegateBasedStandardCRUDRepo<ObjectType, IdType, InputValueType>(
-    readDelegate: ReadStandardCRUDRepo<ObjectType, IdType>,
-    writeDelegate: WriteStandardCRUDRepo<ObjectType, IdType, InputValueType>
-) : StandardCRUDRepo<ObjectType, IdType, InputValueType>,
-    ReadStandardCRUDRepo<ObjectType, IdType> by readDelegate,
-    WriteStandardCRUDRepo<ObjectType, IdType, InputValueType> by writeDelegate
+typealias CRUDRepo<ObjectType, IdType, InputValueType> = StandardCRUDRepo<ObjectType, IdType, InputValueType>

repos/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/StandartKeyValueRepo.kt

@@ -50,10 +50,3 @@ interface StandardKeyValueRepo<Key, Value> : ReadStandardKeyValueRepo<Key, Value
     }
 }
 typealias KeyValueRepo<Key,Value> = StandardKeyValueRepo<Key, Value>
-
-class DelegateBasedStandardKeyValueRepo<Key, Value>(
-    readDelegate: ReadStandardKeyValueRepo<Key, Value>,
-    writeDelegate: WriteStandardKeyValueRepo<Key, Value>
-) : StandardKeyValueRepo<Key, Value>,
-    ReadStandardKeyValueRepo<Key, Value> by readDelegate,
-    WriteStandardKeyValueRepo<Key, Value> by writeDelegate

repos/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/mappers/KeyValueMappers.kt

@@ -126,10 +126,9 @@ inline fun <reified FromKey, reified FromValue, reified ToKey, reified ToValue>
     mapper(keyFromToTo, valueFromToTo, keyToToFrom, valueToToFrom)
 )
 
-@Suppress("DELEGATED_MEMBER_HIDES_SUPERTYPE_OVERRIDE")
 open class MapperStandardKeyValueRepo<FromKey, FromValue, ToKey, ToValue>(
     private val to: StandardKeyValueRepo<ToKey, ToValue>,
-    private val mapper: MapperRepo<FromKey, FromValue, ToKey, ToValue>
+    mapper: MapperRepo<FromKey, FromValue, ToKey, ToValue>
 ) : StandardKeyValueRepo<FromKey, FromValue>,
     MapperRepo<FromKey, FromValue, ToKey, ToValue> by mapper,
     ReadStandardKeyValueRepo<FromKey, FromValue> by MapperReadStandardKeyValueRepo(to, mapper),

repos/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/mappers/OneToManyKeyValueMappers.kt

@@ -132,7 +132,6 @@ inline fun <reified FromKey, reified FromValue, reified ToKey, reified ToValue>
     mapper(keyFromToTo, valueFromToTo, keyToToFrom, valueToToFrom)
 )
 
-@Suppress("DELEGATED_MEMBER_HIDES_SUPERTYPE_OVERRIDE")
 open class MapperOneToManyKeyValueRepo<FromKey, FromValue, ToKey, ToValue>(
     private val to: OneToManyKeyValueRepo<ToKey, ToValue>,
     mapper: MapperRepo<FromKey, FromValue, ToKey, ToValue>

repos/common/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/FileStandardKeyValueRepo.kt

@@ -175,11 +175,9 @@ class FileWriteStandardKeyValueRepo(
 }
 
 @Warning("Files watching will not correctly works on Android Platform with version of API lower than API 26")
-@Suppress("DELEGATED_MEMBER_HIDES_SUPERTYPE_OVERRIDE")
 class FileStandardKeyValueRepo(
     folder: File,
     filesChangedProcessingScope: CoroutineScope? = null
 ) : StandardKeyValueRepo<String, File>,
     WriteStandardKeyValueRepo<String, File> by FileWriteStandardKeyValueRepo(folder, filesChangedProcessingScope),
-    ReadStandardKeyValueRepo<String, File> by FileReadStandardKeyValueRepo(folder) {
-}
+    ReadStandardKeyValueRepo<String, File> by FileReadStandardKeyValueRepo(folder)

repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/keyvalue/KeyValueStore.kt

@@ -16,7 +16,6 @@ fun <T : Any> Context.keyValueStore(
     name: String = "default",
     cacheValues: Boolean = false
 ): StandardKeyValueRepo<String, T> {
-    @Suppress("UNCHECKED_CAST")
     return cache.getOrPut(name) {
         KeyValueStore<T>(this, name, cacheValues)
     } as KeyValueStore<T>
@@ -63,7 +62,6 @@ class KeyValueStore<T : Any> internal constructor (
     }
 
     override suspend fun get(k: String): T? {
-        @Suppress("UNCHECKED_CAST")
         return (cachedData ?. get(k) ?: sharedPreferences.all[k]) as? T
     }
 
@@ -75,10 +73,7 @@ class KeyValueStore<T : Any> internal constructor (
             PaginationResult(
                 it.page,
                 it.pagesNumber,
-                it.results.map {
-                    @Suppress("UNCHECKED_CAST")
-                    it as T
-                }.let { if (reversed) it.reversed() else it },
+                it.results.map { it as T }.let { if (reversed) it.reversed() else it },
                 it.size
             )
         }
@@ -160,9 +155,3 @@ class KeyValueStore<T : Any> internal constructor (
         }
     }
 }
-
-inline fun <T : Any> SharedPreferencesKeyValueRepo(
-    context: Context,
-    name: String = "default",
-    cacheValues: Boolean = false
-) = context.keyValueStore<T>(name, cacheValues)

repos/inmemory/src/commonMain/kotlin/dev/inmo/micro_utils/repos/MapCRUDRepo.kt

@@ -74,24 +74,19 @@ abstract class MapCRUDRepo<ObjectType, IdType, InputValueType>(
 
 fun <ObjectType, IdType, InputValueType> MapCRUDRepo(
     map: MutableMap<IdType, ObjectType>,
-    updateCallback: suspend MutableMap<IdType, ObjectType>.(newValue: InputValueType, id: IdType, old: ObjectType) -> ObjectType,
-    createCallback: suspend MutableMap<IdType, ObjectType>.(newValue: InputValueType) -> Pair<IdType, ObjectType>
+    updateCallback: suspend (newValue: InputValueType, id: IdType, old: ObjectType) -> ObjectType,
+    createCallback: suspend (newValue: InputValueType) -> Pair<IdType, ObjectType>
 ) = object : MapCRUDRepo<ObjectType, IdType, InputValueType>(map) {
     override suspend fun updateObject(
         newValue: InputValueType,
         id: IdType,
         old: ObjectType
-    ): ObjectType = map.updateCallback(newValue, id, old)
+    ): ObjectType = updateCallback(newValue, id, old)
 
-    override suspend fun createObject(newValue: InputValueType): Pair<IdType, ObjectType> = map.createCallback(newValue)
+    override suspend fun createObject(newValue: InputValueType): Pair<IdType, ObjectType> = createCallback(newValue)
 }
 
-fun <ObjectType, IdType, InputValueType> MapCRUDRepo(
-    updateCallback: suspend MutableMap<IdType, ObjectType>.(newValue: InputValueType, id: IdType, old: ObjectType) -> ObjectType,
-    createCallback: suspend MutableMap<IdType, ObjectType>.(newValue: InputValueType) -> Pair<IdType, ObjectType>
-) = MapCRUDRepo(mutableMapOf(), updateCallback, createCallback)
-
 fun <ObjectType, IdType, InputValueType> MutableMap<IdType, ObjectType>.asCrudRepo(
-    updateCallback: suspend MutableMap<IdType, ObjectType>.(newValue: InputValueType, id: IdType, old: ObjectType) -> ObjectType,
-    createCallback: suspend MutableMap<IdType, ObjectType>.(newValue: InputValueType) -> Pair<IdType, ObjectType>
+    updateCallback: suspend (newValue: InputValueType, id: IdType, old: ObjectType) -> ObjectType,
+    createCallback: suspend (newValue: InputValueType) -> Pair<IdType, ObjectType>
 ) = MapCRUDRepo(this, updateCallback, createCallback)

repos/inmemory/src/commonMain/kotlin/dev/inmo/micro_utils/repos/MapKeyValueRepo.kt

@@ -78,11 +78,11 @@ class WriteMapKeyValueRepo<Key, Value>(
     }
 
     override suspend fun unsetWithValues(toUnset: List<Value>) {
-        map.mapNotNull { (k, v) ->
-            k.takeIf { v in toUnset }
-        }.forEach {
-            map.remove(it)
-            _onValueRemoved.emit(it)
+        map.forEach {
+            if (it.value in toUnset) {
+                map.remove(it.key)
+                _onValueRemoved.emit(it.key)
+            }
         }
     }
 }

repos/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/client/crud/KtorReadStandardCrudRepo.kt

@@ -5,12 +5,10 @@ import dev.inmo.micro_utils.ktor.common.*
 import dev.inmo.micro_utils.pagination.*
 import dev.inmo.micro_utils.repos.ReadStandardCRUDRepo
 import dev.inmo.micro_utils.repos.ktor.common.crud.*
-import dev.inmo.micro_utils.repos.ktor.common.idParameterName
 import io.ktor.client.HttpClient
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.serializer
 
-@Deprecated("Use KtorReadStandardCrudRepoClient instead")
 class KtorReadStandardCrudRepo<ObjectType, IdType> (
     private val baseUrl: String,
     private val unifiedRequester: UnifiedRequester,
@@ -40,7 +38,9 @@ class KtorReadStandardCrudRepo<ObjectType, IdType> (
         buildStandardUrl(
             baseUrl,
             getByIdRouting,
-            idParameterName to unifiedRequester.encodeUrlQueryValue(idsSerializer, id)
+            mapOf(
+                "id" to unifiedRequester.encodeUrlQueryValue(idsSerializer, id)
+            )
         ),
         objectsSerializerNullable
     )
@@ -49,7 +49,9 @@ class KtorReadStandardCrudRepo<ObjectType, IdType> (
         buildStandardUrl(
             baseUrl,
             containsRouting,
-            idParameterName to unifiedRequester.encodeUrlQueryValue(idsSerializer, id)
+            mapOf(
+                "id" to unifiedRequester.encodeUrlQueryValue(idsSerializer, id)
+            )
         ),
         Boolean.serializer()
     )

repos/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/client/crud/KtorReadStandardCrudRepoClient.kt

@@ -1,94 +0,0 @@
-package dev.inmo.micro_utils.repos.ktor.client.crud
-
-import dev.inmo.micro_utils.ktor.common.*
-import dev.inmo.micro_utils.pagination.*
-import dev.inmo.micro_utils.repos.ReadStandardCRUDRepo
-import dev.inmo.micro_utils.repos.ktor.common.crud.*
-import dev.inmo.micro_utils.repos.ktor.common.idParameterName
-import io.ktor.client.HttpClient
-import io.ktor.client.call.body
-import io.ktor.client.request.get
-import io.ktor.http.*
-import io.ktor.util.reflect.TypeInfo
-import io.ktor.util.reflect.typeInfo
-import kotlinx.serialization.*
-
-class KtorReadStandardCrudRepoClient<ObjectType, IdType> (
-    private val baseUrl: String,
-    private val httpClient: HttpClient,
-    private val objectType: TypeInfo,
-    private val contentType: ContentType,
-    private val idSerializer: suspend (IdType) -> String
-) : ReadStandardCRUDRepo<ObjectType, IdType> {
-    override suspend fun getByPagination(pagination: Pagination): PaginationResult<ObjectType> = httpClient.get(
-        buildStandardUrl(baseUrl, getByPaginationRouting, pagination.asUrlQueryParts)
-    ) {
-        contentType(contentType)
-    }.body()
-
-    override suspend fun getById(id: IdType): ObjectType? = httpClient.get(
-        buildStandardUrl(
-            baseUrl,
-            getByIdRouting,
-            mapOf(
-                idParameterName to idSerializer(id)
-            )
-        )
-    ) {
-        contentType(contentType)
-    }.takeIf { it.status != HttpStatusCode.NoContent } ?.body<ObjectType>(objectType)
-
-    override suspend fun contains(id: IdType): Boolean = httpClient.get(
-        buildStandardUrl(
-            baseUrl,
-            containsRouting,
-            mapOf(
-                idParameterName to idSerializer(id)
-            )
-        )
-    ) {
-        contentType(contentType)
-    }.body()
-
-    override suspend fun count(): Long = httpClient.get(
-        buildStandardUrl(
-            baseUrl,
-            countRouting
-        )
-    ) {
-        contentType(contentType)
-    }.body()
-}
-
-inline fun <reified ObjectType, IdType> KtorReadStandardCrudRepoClient(
-    baseUrl: String,
-    httpClient: HttpClient,
-    contentType: ContentType,
-    noinline idSerializer: suspend (IdType) -> String
-) = KtorReadStandardCrudRepoClient<ObjectType, IdType>(
-    baseUrl,
-    httpClient,
-    typeInfo<ObjectType>(),
-    contentType,
-    idSerializer
-)
-
-inline fun <reified ObjectType, IdType> KtorReadStandardCrudRepoClient(
-    baseUrl: String,
-    httpClient: HttpClient,
-    idsSerializer: KSerializer<IdType>,
-    serialFormat: StringFormat,
-    contentType: ContentType,
-) = KtorReadStandardCrudRepoClient<ObjectType, IdType>(baseUrl, httpClient, contentType) {
-    serialFormat.encodeToString(idsSerializer, it)
-}
-
-inline fun <reified ObjectType, IdType> KtorReadStandardCrudRepoClient(
-    baseUrl: String,
-    httpClient: HttpClient,
-    idsSerializer: KSerializer<IdType>,
-    serialFormat: BinaryFormat,
-    contentType: ContentType,
-) = KtorReadStandardCrudRepoClient<ObjectType, IdType>(baseUrl, httpClient, contentType) {
-    serialFormat.encodeHex(idsSerializer, it)
-}

repos/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/client/crud/KtorStandardCrudRepo.kt

@@ -7,7 +7,6 @@ import dev.inmo.micro_utils.repos.*
 import io.ktor.client.HttpClient
 import kotlinx.serialization.KSerializer
 
-@Deprecated("Use KtorStandardCrudRepoClient instead")
 class KtorStandardCrudRepo<ObjectType, IdType, InputValue> (
     baseUrl: String,
     baseSubpart: String,

repos/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/client/crud/KtorStandardCrudRepoClient.kt

@@ -1,122 +0,0 @@
-package dev.inmo.micro_utils.repos.ktor.client.crud
-
-import dev.inmo.micro_utils.ktor.common.*
-import dev.inmo.micro_utils.repos.*
-import io.ktor.client.HttpClient
-import io.ktor.client.utils.EmptyContent.contentType
-import io.ktor.http.ContentType
-import io.ktor.util.reflect.TypeInfo
-import io.ktor.util.reflect.typeInfo
-import kotlinx.serialization.*
-
-class KtorStandardCrudRepoClient<ObjectType, IdType, InputValue> (
-    readDelegate: ReadStandardCRUDRepo<ObjectType, IdType>,
-    writeDelegate: WriteStandardCRUDRepo<ObjectType, IdType, InputValue>
-) : StandardCRUDRepo<ObjectType, IdType, InputValue> by DelegateBasedStandardCRUDRepo(
-    readDelegate,
-    writeDelegate
-) {
-    companion object {
-        inline operator fun <reified ObjectType, reified IdType, reified InputValue> invoke(
-            baseUrl: String,
-            httpClient: HttpClient,
-            objectTypeInfo: TypeInfo,
-            contentType: ContentType,
-            noinline idSerializer: suspend (IdType) -> String
-        ) = KtorStandardCrudRepoClient(
-            KtorReadStandardCrudRepoClient(
-                baseUrl,
-                httpClient,
-                objectTypeInfo,
-                contentType,
-                idSerializer
-            ),
-            KtorWriteStandardCrudRepoClient<ObjectType, IdType, InputValue>(
-                baseUrl,
-                httpClient,
-                contentType
-            )
-        )
-
-        inline operator fun <reified ObjectType, reified IdType, reified InputValue> invoke(
-            baseUrl: String,
-            subpart: String,
-            httpClient: HttpClient,
-            objectTypeInfo: TypeInfo,
-            contentType: ContentType,
-            noinline idSerializer: suspend (IdType) -> String
-        ) = KtorStandardCrudRepoClient<ObjectType, IdType, InputValue>(
-            buildStandardUrl(baseUrl, subpart),
-            httpClient,
-            objectTypeInfo,
-            contentType,
-            idSerializer
-        )
-    }
-}
-
-
-inline fun <reified ObjectType, reified IdType, reified InputValue> KtorStandardCrudRepoClient(
-    baseUrl: String,
-    httpClient: HttpClient,
-    contentType: ContentType,
-    noinline idSerializer: suspend (IdType) -> String
-) = KtorStandardCrudRepoClient<ObjectType, IdType, InputValue>(
-    baseUrl,
-    httpClient,
-    typeInfo<ObjectType>(),
-    contentType,
-    idSerializer
-)
-
-inline fun <reified ObjectType, reified IdType, reified InputValue> KtorStandardCrudRepoClient(
-    baseUrl: String,
-    httpClient: HttpClient,
-    idsSerializer: KSerializer<IdType>,
-    serialFormat: StringFormat,
-    contentType: ContentType,
-) = KtorStandardCrudRepoClient<ObjectType, IdType, InputValue>(baseUrl, httpClient, contentType) {
-    serialFormat.encodeToString(idsSerializer, it)
-}
-
-inline fun <reified ObjectType, reified IdType, reified InputValue> KtorStandardCrudRepoClient(
-    baseUrl: String,
-    httpClient: HttpClient,
-    idsSerializer: KSerializer<IdType>,
-    serialFormat: BinaryFormat,
-    contentType: ContentType,
-) = KtorStandardCrudRepoClient<ObjectType, IdType, InputValue>(baseUrl, httpClient, contentType) {
-    serialFormat.encodeHex(idsSerializer, it)
-}
-
-
-inline fun <reified ObjectType, reified IdType, reified InputValue> KtorStandardCrudRepoClient(
-    baseUrl: String,
-    subpart: String,
-    httpClient: HttpClient,
-    contentType: ContentType,
-    noinline idSerializer: suspend (IdType) -> String
-) = KtorStandardCrudRepoClient<ObjectType, IdType, InputValue>(
-    buildStandardUrl(baseUrl, subpart),
-    httpClient,
-    contentType,
-    idSerializer
-)
-
-inline fun <reified ObjectType, reified IdType, reified InputValue> KtorStandardCrudRepoClient(
-    baseUrl: String,
-    subpart: String,
-    httpClient: HttpClient,
-    idsSerializer: KSerializer<IdType>,
-    serialFormat: StringFormat,
-    contentType: ContentType,
-) = KtorStandardCrudRepoClient<ObjectType, IdType, InputValue>(buildStandardUrl(baseUrl, subpart), httpClient, idsSerializer, serialFormat, contentType)
-
-inline fun <reified ObjectType, reified IdType, reified InputValue> KtorStandardCrudRepoClient(
-    baseUrl: String,
-    subpart: String,
-    httpClient: HttpClient,
-    idsSerializer: KSerializer<IdType>,
-    serialFormat: BinaryFormat,
-    contentType: ContentType,
-) = KtorStandardCrudRepoClient<ObjectType, IdType, InputValue>(buildStandardUrl(baseUrl, subpart), httpClient, idsSerializer, serialFormat, contentType)

repos/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/client/crud/KtorWriteStandardCrudRepo.kt

@@ -10,7 +10,6 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.*
 
-@Deprecated("Use KtorWriteStandardCrudRepoClient instead")
 class KtorWriteStandardCrudRepo<ObjectType, IdType, InputValue> (
     private val baseUrl: String,
     private val unifiedRequester: UnifiedRequester,

repos/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/client/crud/KtorWriteStandardCrudRepoClient.kt

@@ -1,89 +0,0 @@
-package dev.inmo.micro_utils.repos.ktor.client.crud
-
-import dev.inmo.micro_utils.ktor.client.*
-import dev.inmo.micro_utils.ktor.common.*
-import dev.inmo.micro_utils.repos.UpdatedValuePair
-import dev.inmo.micro_utils.repos.WriteStandardCRUDRepo
-import dev.inmo.micro_utils.repos.ktor.common.crud.*
-import io.ktor.client.HttpClient
-import io.ktor.client.call.body
-import io.ktor.client.request.*
-import io.ktor.client.statement.HttpResponse
-import io.ktor.http.ContentType
-import io.ktor.http.contentType
-import io.ktor.util.reflect.TypeInfo
-import io.ktor.util.reflect.typeInfo
-import kotlinx.coroutines.flow.Flow
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.builtins.*
-
-class KtorWriteStandardCrudRepoClient<ObjectType, IdType, InputValue> (
-    private val baseUrl: String,
-    private val httpClient: HttpClient,
-    override val newObjectsFlow: Flow<ObjectType>,
-    override val updatedObjectsFlow: Flow<ObjectType>,
-    override val deletedObjectsIdsFlow: Flow<IdType>,
-    private val createSetup: suspend HttpRequestBuilder.(List<InputValue>) -> Unit,
-    private val updateSetup: suspend HttpRequestBuilder.(List<UpdatedValuePair<IdType, InputValue>>) -> Unit,
-    private val deleteByIdSetup: suspend HttpRequestBuilder.(List<IdType>) -> Unit,
-    private val createBodyGetter: suspend HttpResponse.() -> List<ObjectType>,
-    private val updateBodyGetter: suspend HttpResponse.() -> List<ObjectType>
-) : WriteStandardCRUDRepo<ObjectType, IdType, InputValue> {
-    override suspend fun create(values: List<InputValue>): List<ObjectType> = httpClient.post(
-        buildStandardUrl(baseUrl, createRouting)
-    ) {
-        createSetup(values)
-    }.createBodyGetter()
-
-    override suspend fun update(
-        values: List<UpdatedValuePair<IdType, InputValue>>
-    ): List<ObjectType> = httpClient.post(
-        buildStandardUrl(baseUrl, updateManyRouting)
-    ) {
-        updateSetup(values)
-    }.updateBodyGetter()
-
-    override suspend fun update(id: IdType, value: InputValue): ObjectType? = update(listOf(id to value)).firstOrNull()
-
-    override suspend fun deleteById(ids: List<IdType>) {
-        httpClient.post(
-            buildStandardUrl(baseUrl, deleteByIdRouting)
-        ) {
-            deleteByIdSetup(ids)
-        }.status
-    }
-
-    companion object {
-        inline operator fun <reified ObjectType, reified IdType, reified InputValue> invoke(
-            baseUrl: String,
-            httpClient: HttpClient,
-            contentType: ContentType
-        ) = KtorWriteStandardCrudRepoClient<ObjectType, IdType, InputValue>(
-            baseUrl,
-            httpClient,
-            httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, newObjectsFlowRouting),
-            ),
-            httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, updatedObjectsFlowRouting),
-            ),
-            httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, deletedObjectsIdsFlowRouting),
-            ),
-            {
-                contentType(contentType)
-                setBody(it)
-            },
-            {
-                contentType(contentType)
-                setBody(it)
-            },
-            {
-                contentType(contentType)
-                setBody(it)
-            },
-            { body() },
-            { body() }
-        )
-    }
-}

repos/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/client/key_value/KtorReadStandardKeyValueRepoClient.kt

@@ -1,144 +0,0 @@
-package dev.inmo.micro_utils.repos.ktor.client.key_value
-
-import dev.inmo.micro_utils.ktor.common.*
-import dev.inmo.micro_utils.pagination.*
-import dev.inmo.micro_utils.repos.ReadStandardKeyValueRepo
-import dev.inmo.micro_utils.repos.ktor.common.*
-import dev.inmo.micro_utils.repos.ktor.common.crud.*
-import dev.inmo.micro_utils.repos.ktor.common.key_value.*
-import dev.inmo.micro_utils.repos.ktor.common.one_to_many.containsByKeyRoute
-import dev.inmo.micro_utils.repos.ktor.common.reversedParameterName
-import io.ktor.client.HttpClient
-import io.ktor.client.call.body
-import io.ktor.client.request.get
-import io.ktor.http.*
-import io.ktor.util.reflect.TypeInfo
-import io.ktor.util.reflect.typeInfo
-import kotlinx.serialization.*
-
-class KtorReadStandardKeyValueRepoClient<Key, Value>(
-    private val baseUrl: String,
-    private val httpClient: HttpClient,
-    private val contentType: ContentType,
-    private val objectType: TypeInfo,
-    private val paginationResultObjectsTypeInfo: TypeInfo,
-    private val paginationResultIdsTypeInfo: TypeInfo,
-    private val idSerializer: suspend (Key) -> String,
-    private val valueSerializer: suspend (Value) -> String
-) : ReadStandardKeyValueRepo<Key, Value> {
-    override suspend fun get(k: Key): Value? = httpClient.get(
-        buildStandardUrl(
-            baseUrl,
-            getRoute,
-            mapOf(
-                idParameterName to idSerializer(k)
-            )
-        )
-    ) {
-        contentType(contentType)
-    }.takeIf { it.status != HttpStatusCode.NoContent } ?.body<Value>(objectType)
-
-    override suspend fun contains(key: Key): Boolean = httpClient.get(
-        buildStandardUrl(
-            baseUrl,
-            containsRoute,
-            idParameterName to idSerializer(key)
-        )
-    ) {
-        contentType(contentType)
-    }.body()
-
-    override suspend fun values(
-        pagination: Pagination,
-        reversed: Boolean
-    ): PaginationResult<Value> = httpClient.get(
-        buildStandardUrl(baseUrl, valuesRoute, pagination.asUrlQueryParts + (reversedParameterName to reversed.toString()))
-    ) {
-        contentType(contentType)
-    }.body(paginationResultObjectsTypeInfo)
-
-    override suspend fun keys(
-        pagination: Pagination,
-        reversed: Boolean
-    ): PaginationResult<Key> = httpClient.get(
-        buildStandardUrl(baseUrl, keysRoute, pagination.asUrlQueryParts + (reversedParameterName to reversed.toString()))
-    ) {
-        contentType(contentType)
-    }.body(paginationResultIdsTypeInfo)
-
-    override suspend fun keys(
-        v: Value,
-        pagination: Pagination,
-        reversed: Boolean
-    ): PaginationResult<Key> = httpClient.get(
-        buildStandardUrl(
-            baseUrl,
-            keysRoute,
-            pagination.asUrlQueryParts + (reversedParameterName to reversed.toString()) + (valueParameterName to valueSerializer(v))
-        )
-    ) {
-        contentType(contentType)
-    }.body(paginationResultIdsTypeInfo)
-
-    override suspend fun count(): Long = httpClient.get(
-        buildStandardUrl(
-            baseUrl,
-            countRouting
-        )
-    ) {
-        contentType(contentType)
-    }.body()
-}
-
-inline fun <reified Key, reified Value> KtorReadStandardKeyValueRepoClient(
-    baseUrl: String,
-    httpClient: HttpClient,
-    contentType: ContentType,
-    noinline idSerializer: suspend (Key) -> String,
-    noinline valueSerializer: suspend (Value) -> String
-) = KtorReadStandardKeyValueRepoClient<Key, Value>(
-    baseUrl,
-    httpClient,
-    contentType,
-    typeInfo<Value>(),
-    typeInfo<PaginationResult<Value>>(),
-    typeInfo<PaginationResult<Key>>(),
-    idSerializer,
-    valueSerializer
-)
-
-inline fun <reified Key, reified Value> KtorReadStandardKeyValueRepoClient(
-    baseUrl: String,
-    httpClient: HttpClient,
-    idsSerializer: KSerializer<Key>,
-    valueSerializer: KSerializer<Value>,
-    serialFormat: StringFormat,
-    contentType: ContentType,
-) = KtorReadStandardKeyValueRepoClient<Key, Value>(
-    baseUrl,
-    httpClient,
-    contentType,
-    {
-        serialFormat.encodeToString(idsSerializer, it).encodeURLQueryComponent()
-    }
-) {
-    serialFormat.encodeToString(valueSerializer, it).encodeURLQueryComponent()
-}
-
-inline fun <reified Key, reified Value> KtorReadStandardKeyValueRepoClient(
-    baseUrl: String,
-    httpClient: HttpClient,
-    idsSerializer: KSerializer<Key>,
-    valuesSerializer: KSerializer<Value>,
-    serialFormat: BinaryFormat,
-    contentType: ContentType,
-) = KtorReadStandardKeyValueRepoClient<Key, Value>(
-    baseUrl,
-    httpClient,
-    contentType,
-    {
-        serialFormat.encodeHex(idsSerializer, it)
-    }
-) {
-    serialFormat.encodeHex(valuesSerializer, it)
-}

repos/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/client/key_value/KtorStandardKeyValueRepoClient.kt

@@ -1,85 +0,0 @@
-package dev.inmo.micro_utils.repos.ktor.client.key_value
-
-import dev.inmo.micro_utils.ktor.common.*
-import dev.inmo.micro_utils.repos.*
-import io.ktor.client.HttpClient
-import io.ktor.http.ContentType
-import io.ktor.http.encodeURLQueryComponent
-import kotlinx.serialization.*
-
-class KtorStandardKeyValueRepoClient<Key, Value> (
-    readDelegate: ReadStandardKeyValueRepo<Key, Value>,
-    writeDelegate: WriteStandardKeyValueRepo<Key, Value>
-) : StandardKeyValueRepo<Key, Value> by DelegateBasedStandardKeyValueRepo(
-    readDelegate,
-    writeDelegate
-) {
-    companion object {
-        inline operator fun <reified Key, reified Value> invoke(
-            baseUrl: String,
-            httpClient: HttpClient,
-            contentType: ContentType,
-            noinline idSerializer: suspend (Key) -> String,
-            noinline valueSerializer: suspend (Value) -> String
-        ) = KtorStandardKeyValueRepoClient(
-            KtorReadStandardKeyValueRepoClient(
-                baseUrl, httpClient, contentType, idSerializer, valueSerializer
-            ),
-            KtorWriteStandardKeyValueRepoClient(
-                baseUrl,
-                httpClient,
-                contentType
-            )
-        )
-        inline operator fun <reified Key, reified Value> invoke(
-            baseUrl: String,
-            subpart: String,
-            httpClient: HttpClient,
-            contentType: ContentType,
-            noinline idSerializer: suspend (Key) -> String,
-            noinline valueSerializer: suspend (Value) -> String
-        ) = KtorStandardKeyValueRepoClient(
-            buildStandardUrl(baseUrl, subpart),
-            httpClient,
-            contentType,
-            idSerializer,
-            valueSerializer
-        )
-    }
-}
-
-inline fun <reified Key, reified Value> KtorStandardKeyValueRepoClient(
-    baseUrl: String,
-    httpClient: HttpClient,
-    contentType: ContentType,
-    idSerializer: SerializationStrategy<Key>,
-    valueSerializer: SerializationStrategy<Value>,
-    serialFormat: StringFormat,
-) = KtorStandardKeyValueRepoClient<Key, Value>(
-    baseUrl,
-    httpClient,
-    contentType,
-    {
-        serialFormat.encodeToString(idSerializer, it).encodeURLQueryComponent()
-    }
-) {
-    serialFormat.encodeToString(valueSerializer, it).encodeURLQueryComponent()
-}
-
-inline fun <reified Key, reified Value> KtorStandardKeyValueRepoClient(
-    baseUrl: String,
-    httpClient: HttpClient,
-    contentType: ContentType,
-    idSerializer: SerializationStrategy<Key>,
-    valueSerializer: SerializationStrategy<Value>,
-    serialFormat: BinaryFormat,
-) = KtorStandardKeyValueRepoClient<Key, Value>(
-    baseUrl,
-    httpClient,
-    contentType,
-    {
-        serialFormat.encodeHex(idSerializer, it)
-    }
-) {
-    serialFormat.encodeHex(valueSerializer, it)
-}

repos/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/client/key_value/KtorWriteStandardKeyValueRepoClient.kt

@@ -1,83 +0,0 @@
-package dev.inmo.micro_utils.repos.ktor.client.key_value
-
-import dev.inmo.micro_utils.ktor.client.createStandardWebsocketFlow
-import dev.inmo.micro_utils.ktor.common.*
-import dev.inmo.micro_utils.pagination.*
-import dev.inmo.micro_utils.repos.WriteStandardKeyValueRepo
-import dev.inmo.micro_utils.repos.ktor.common.*
-import dev.inmo.micro_utils.repos.ktor.common.crud.*
-import dev.inmo.micro_utils.repos.ktor.common.key_value.*
-import io.ktor.client.HttpClient
-import io.ktor.client.request.get
-import io.ktor.client.request.post
-import io.ktor.http.*
-import io.ktor.util.InternalAPI
-import io.ktor.util.reflect.TypeInfo
-import io.ktor.util.reflect.typeInfo
-import kotlinx.coroutines.flow.Flow
-import kotlinx.serialization.*
-
-class KtorWriteStandardKeyValueRepoClient<Key, Value>(
-    private val baseUrl: String,
-    private val httpClient: HttpClient,
-    private val contentType: ContentType,
-    override val onNewValue: Flow<Pair<Key, Value>>,
-    override val onValueRemoved: Flow<Key>,
-    private val idsListTypeInfo: TypeInfo,
-    private val objectsListTypeInfo: TypeInfo,
-    private val idsToObjectsMapTypeInfo: TypeInfo
-) : WriteStandardKeyValueRepo<Key, Value> {
-    @OptIn(InternalAPI::class)
-    override suspend fun unsetWithValues(toUnset: List<Value>) {
-        httpClient.post(
-            buildStandardUrl(baseUrl, unsetWithValuesRoute)
-        ) {
-            body = toUnset
-            bodyType = objectsListTypeInfo
-            contentType(contentType)
-        }.status
-    }
-
-    @OptIn(InternalAPI::class)
-    override suspend fun unset(toUnset: List<Key>) {
-        httpClient.post(
-            buildStandardUrl(baseUrl, unsetRoute)
-        ) {
-            body = toUnset
-            bodyType = idsListTypeInfo
-            contentType(contentType)
-        }.status
-    }
-
-    @OptIn(InternalAPI::class)
-    override suspend fun set(toSet: Map<Key, Value>) {
-        httpClient.post(
-            buildStandardUrl(baseUrl, setRoute)
-        ) {
-            body = toSet
-            bodyType = idsToObjectsMapTypeInfo
-            contentType(contentType)
-        }.status
-    }
-
-    companion object {
-        inline operator fun <reified Key, reified Value> invoke(
-            baseUrl: String,
-            httpClient: HttpClient,
-            contentType: ContentType
-        ) = KtorWriteStandardKeyValueRepoClient<Key, Value>(
-            baseUrl,
-            httpClient,
-            contentType,
-            httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, onNewValueRoute),
-            ),
-            httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, onValueRemovedRoute),
-            ),
-            typeInfo<List<Key>>(),
-            typeInfo<List<Value>>(),
-            typeInfo<Map<Key, Value>>()
-        )
-    }
-}

repos/ktor/common/build.gradle

@@ -13,22 +13,5 @@ kotlin {
                 api internalProject("micro_utils.repos.common")
             }
         }
-        jvmTest {
-            dependencies {
-                implementation internalProject("micro_utils.repos.common")
-                implementation internalProject("micro_utils.repos.ktor.client")
-                implementation internalProject("micro_utils.repos.ktor.server")
-                implementation internalProject("micro_utils.repos.inmemory")
-                implementation libs.kt.coroutines.test
-
-                implementation libs.ktor.server.cio
-                implementation libs.ktor.client.cio
-                implementation libs.ktor.server.content.negotiation
-                implementation libs.ktor.serialization.kotlinx.json
-                implementation libs.ktor.client.content.negotiation
-                implementation libs.ktor.client.logging
-                implementation libs.ktor.client.websockets
-            }
-        }
     }
 }

repos/ktor/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/common/ParametersNames.kt

@@ -1,6 +1,5 @@
 package dev.inmo.micro_utils.repos.ktor.common
 
-const val idParameterName = "id"
 const val keyParameterName = "key"
 const val valueParameterName = "value"
-const val reversedParameterName = "reversed"
+const val reversedParameterName = "reversed"

repos/ktor/common/src/jvmTest/kotlin/CRUDTests.kt

@@ -1,89 +0,0 @@
-import dev.inmo.micro_utils.repos.*
-import dev.inmo.micro_utils.repos.ktor.client.crud.KtorStandardCrudRepoClient
-import dev.inmo.micro_utils.repos.ktor.server.crud.configureStandardCrudRepoRoutes
-import io.ktor.client.HttpClient
-import io.ktor.client.plugins.logging.Logging
-import io.ktor.http.ContentType
-import io.ktor.serialization.kotlinx.KotlinxWebsocketSerializationConverter
-import io.ktor.serialization.kotlinx.json.json
-import io.ktor.server.application.install
-import io.ktor.server.cio.CIO
-import io.ktor.server.plugins.contentnegotiation.ContentNegotiation
-import io.ktor.server.routing.routing
-import io.ktor.server.websocket.WebSockets
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.test.runTest
-import kotlinx.serialization.json.Json
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-class CRUDTests {
-    @OptIn(ExperimentalCoroutinesApi::class)
-    @Test
-    fun testCRUDFunctions() {
-        runTest() {
-            val map = mutableMapOf<Int, ComplexData>()
-            val repo = MapCRUDRepo<ComplexData, Int, SimpleData>(
-                map,
-                { newValue, id, oldValue ->
-                    oldValue.copy(title = newValue.title)
-                }
-            ) {
-                size to ComplexData(size, title = it.title)
-            }
-            val server = io.ktor.server.engine.embeddedServer(
-                CIO,
-                23456,
-                "127.0.0.1"
-            ) {
-                install(ContentNegotiation) {
-                    json()
-                }
-                install(WebSockets) {
-                    contentConverter = KotlinxWebsocketSerializationConverter(Json)
-                }
-                routing {
-                    configureStandardCrudRepoRoutes(
-                        repo
-                    ) {
-                        it.toInt()
-                    }
-                }
-            }.start(false)
-            val client = HttpClient {
-                install(io.ktor.client.plugins.contentnegotiation.ContentNegotiation) {
-                    json()
-                }
-                install(Logging)
-                install(io.ktor.client.plugins.websocket.WebSockets) {
-                    contentConverter = KotlinxWebsocketSerializationConverter(Json)
-                }
-            }
-            val crudClient = KtorStandardCrudRepoClient<ComplexData, Int, SimpleData>(
-                "http://127.0.0.1:23456",
-                client,
-                ContentType.Application.Json
-            ) {
-                it.toString()
-            }
-
-            val created = crudClient.create(SimpleData("Example")).single()
-            assertEquals(map.size, 1)
-            assertEquals(map.size.toLong(), crudClient.count())
-            assertEquals(1, crudClient.count())
-            assertEquals(map.getValue(map.keys.first()), created)
-
-            val updated = crudClient.update(created.id, SimpleData("Example2"))
-            assertEquals(map.size, 1)
-            assertEquals(map.size.toLong(), crudClient.count())
-            assertEquals(1, crudClient.count())
-            assertEquals(map.getValue(map.keys.first()), updated)
-
-            crudClient.deleteById(created.id)
-            assertEquals(map.size, 0)
-            assertEquals(map.size.toLong(), crudClient.count())
-            assertEquals(0, crudClient.count())
-            server.stop()
-        }
-    }
-}

repos/ktor/common/src/jvmTest/kotlin/ComplexData.kt

@@ -1,10 +0,0 @@
-import com.benasher44.uuid.uuid4
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class ComplexData(
-    val id: Int,
-    val simple: SimpleData = SimpleData(),
-    val simples: List<SimpleData> = (0 until 100).map { SimpleData(("$it")) },
-    val title: String = uuid4().toString()
-)

repos/ktor/common/src/jvmTest/kotlin/KVTests.kt

@@ -1,139 +0,0 @@
-import dev.inmo.micro_utils.pagination.firstPageWithOneElementPagination
-import dev.inmo.micro_utils.pagination.utils.getAllWithNextPaging
-import dev.inmo.micro_utils.repos.*
-import dev.inmo.micro_utils.repos.ktor.client.key_value.KtorStandardKeyValueRepoClient
-import dev.inmo.micro_utils.repos.ktor.server.key_value.configureStandardKeyValueRepoRoutes
-import io.ktor.client.HttpClient
-import io.ktor.client.plugins.logging.Logging
-import io.ktor.http.ContentType
-import io.ktor.serialization.kotlinx.KotlinxWebsocketSerializationConverter
-import io.ktor.serialization.kotlinx.json.json
-import io.ktor.server.application.install
-import io.ktor.server.cio.CIO
-import io.ktor.server.plugins.contentnegotiation.ContentNegotiation
-import io.ktor.server.routing.routing
-import io.ktor.server.websocket.WebSockets
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.test.runTest
-import kotlinx.serialization.builtins.serializer
-import kotlinx.serialization.json.Json
-import kotlin.test.*
-
-class KVTests {
-    @OptIn(ExperimentalCoroutinesApi::class)
-    @Test
-    fun testCRUDFunctions() {
-        runTest() {
-            val map = mutableMapOf<Int, ComplexData>()
-            val repo = MapKeyValueRepo<Int, ComplexData>(map)
-            val server = io.ktor.server.engine.embeddedServer(
-                CIO,
-                23456,
-                "127.0.0.1"
-            ) {
-                install(ContentNegotiation) {
-                    json()
-                }
-                install(WebSockets) {
-                    contentConverter = KotlinxWebsocketSerializationConverter(Json)
-                }
-                routing {
-                    configureStandardKeyValueRepoRoutes(
-                        repo,
-                        Int.serializer(),
-                        ComplexData.serializer(),
-                        Json {}
-                    )
-                }
-            }.start(false)
-            val client = HttpClient {
-                install(io.ktor.client.plugins.contentnegotiation.ContentNegotiation) {
-                    json()
-                }
-                install(Logging)
-                install(io.ktor.client.plugins.websocket.WebSockets) {
-                    contentConverter = KotlinxWebsocketSerializationConverter(Json)
-                }
-            }
-            val crudClient = KtorStandardKeyValueRepoClient<Int, ComplexData>(
-                "http://127.0.0.1:23456",
-                client,
-                ContentType.Application.Json,
-                Int.serializer(),
-                ComplexData.serializer(),
-                Json
-            )
-
-            val dataInOneKey = ComplexData(1, title = "Example1")
-            val dataInMultipleKeys = ComplexData(2, title = "Example2")
-            val repeatCount = 3
-
-            val dataList = listOf(
-                1 to dataInOneKey
-            ) + (0 until repeatCount).map {
-                (it + 2) to dataInMultipleKeys
-            }
-
-            dataList.forEachIndexed { i, (id, data) ->
-                crudClient.set(id, data)
-                assertEquals(map.size, i + 1)
-                assertEquals(map.size.toLong(), crudClient.count())
-                assertEquals(i + 1L, crudClient.count())
-                dataList.take(i + 1).forEach { (id, data) ->
-                    assertEquals(data, map[id])
-                    assertEquals(data, crudClient.get(id))
-                    assertEquals(map[id], crudClient.get(id))
-                }
-            }
-
-            dataList.forEach { (id, data) ->
-                assertTrue(crudClient.contains(id))
-                assertEquals(data, crudClient.get(id))
-            }
-
-            assertEquals(
-                dataList.mapNotNull { if (it.second == dataInMultipleKeys) it.first else null },
-                getAllWithNextPaging(firstPageWithOneElementPagination) {
-                    crudClient.keys(dataInMultipleKeys, it)
-                }
-            )
-
-            assertEquals(
-                dataList.mapNotNull { if (it.second == dataInOneKey) it.first else null },
-                getAllWithNextPaging(firstPageWithOneElementPagination) {
-                    crudClient.keys(dataInOneKey, it)
-                }
-            )
-
-            assertEquals(
-                dataList.map { it.first },
-                getAllWithNextPaging(firstPageWithOneElementPagination) {
-                    crudClient.keys(it)
-                }
-            )
-
-            assertEquals(
-                dataList.map { it.second },
-                getAllWithNextPaging(firstPageWithOneElementPagination) {
-                    crudClient.values(it)
-                }
-            )
-
-            assertEquals(dataList.size.toLong(), crudClient.count())
-
-            crudClient.unsetWithValues(dataInMultipleKeys)
-            assertEquals(
-                dataList.filter { it.second == dataInOneKey }.size.toLong(),
-                crudClient.count()
-            )
-
-            crudClient.unset(dataList.first { it.second == dataInOneKey }.first)
-            assertEquals(
-                0,
-                crudClient.count()
-            )
-
-            server.stop()
-        }
-    }
-}

repos/ktor/common/src/jvmTest/kotlin/SimpleData.kt

@@ -1,7 +0,0 @@
-import com.benasher44.uuid.uuid4
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class SimpleData(
-    val title: String = uuid4().toString()
-)

repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/crud/KtorReadStandardCrudRepo.kt

@@ -7,10 +7,10 @@ import dev.inmo.micro_utils.pagination.PaginationResult
 import dev.inmo.micro_utils.pagination.extractPagination
 import dev.inmo.micro_utils.repos.ReadStandardCRUDRepo
 import dev.inmo.micro_utils.repos.ktor.common.crud.*
+import io.ktor.application.call
 import io.ktor.http.ContentType
-import io.ktor.server.application.call
-import io.ktor.server.routing.Route
-import io.ktor.server.routing.get
+import io.ktor.routing.Route
+import io.ktor.routing.get
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.serializer
 

repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/crud/KtorStandardCrudRepo.kt

@@ -6,8 +6,8 @@ import dev.inmo.micro_utils.ktor.server.UnifiedRouter
 import dev.inmo.micro_utils.ktor.server.standardKtorSerialFormatContentType
 import dev.inmo.micro_utils.repos.StandardCRUDRepo
 import io.ktor.http.ContentType
-import io.ktor.server.routing.Route
-import io.ktor.server.routing.route
+import io.ktor.routing.Route
+import io.ktor.routing.route
 import kotlinx.serialization.KSerializer
 
 fun <ObjectType, IdType, InputValue> Route.configureStandardCrudRepoRoutes(

repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/crud/KtorWriteStandardCrudRepo.kt

@@ -5,9 +5,10 @@ import dev.inmo.micro_utils.ktor.common.standardKtorSerialFormat
 import dev.inmo.micro_utils.ktor.server.*
 import dev.inmo.micro_utils.repos.WriteStandardCRUDRepo
 import dev.inmo.micro_utils.repos.ktor.common.crud.*
+import io.ktor.application.call
 import io.ktor.http.ContentType
-import io.ktor.server.routing.Route
-import io.ktor.server.routing.post
+import io.ktor.routing.Route
+import io.ktor.routing.post
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.*
 

repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/crud/NewKtorReadStandardCrudRepo.kt

@@ -1,72 +0,0 @@
-package dev.inmo.micro_utils.repos.ktor.server.crud
-
-import dev.inmo.micro_utils.ktor.common.decodeHex
-import dev.inmo.micro_utils.ktor.server.*
-import dev.inmo.micro_utils.pagination.extractPagination
-import dev.inmo.micro_utils.repos.ReadStandardCRUDRepo
-import dev.inmo.micro_utils.repos.ktor.common.crud.*
-import dev.inmo.micro_utils.repos.ktor.common.idParameterName
-import io.ktor.http.ContentType
-import io.ktor.http.HttpStatusCode
-import io.ktor.server.application.call
-import io.ktor.server.response.respond
-import io.ktor.server.routing.Route
-import io.ktor.server.routing.get
-import kotlinx.serialization.*
-
-inline fun <reified ObjectType, reified IdType> Route.configureReadStandardCrudRepoRoutes(
-    originalRepo: ReadStandardCRUDRepo<ObjectType, IdType>,
-    noinline idDeserializer: suspend (String) -> IdType
-) {
-    get(getByPaginationRouting) {
-        val pagination = call.request.queryParameters.extractPagination
-
-        call.respond(originalRepo.getByPagination(pagination))
-    }
-
-    get(getByIdRouting) {
-        val id = idDeserializer(
-            call.getQueryParameterOrSendError(idParameterName) ?: return@get
-        )
-
-        val result = originalRepo.getById(id)
-
-        if (result == null) {
-            call.respond(HttpStatusCode.NoContent)
-        } else {
-            call.respond(result)
-        }
-    }
-
-    get(containsRouting) {
-        val id = idDeserializer(
-            call.getQueryParameterOrSendError(idParameterName) ?: return@get
-        )
-
-        call.respond(
-            originalRepo.contains(id)
-        )
-    }
-
-    get(countRouting) {
-        call.respond(
-            originalRepo.count()
-        )
-    }
-}
-
-inline fun <reified ObjectType, reified IdType> Route.configureReadStandardCrudRepoRoutes(
-    originalRepo: ReadStandardCRUDRepo<ObjectType, IdType>,
-    idsSerializer: KSerializer<IdType>,
-    serialFormat: StringFormat
-) = configureReadStandardCrudRepoRoutes(originalRepo) {
-    serialFormat.decodeFromString(idsSerializer, it)
-}
-
-inline fun <reified ObjectType, reified IdType> Route.configureReadStandardCrudRepoRoutes(
-    originalRepo: ReadStandardCRUDRepo<ObjectType, IdType>,
-    idsSerializer: KSerializer<IdType>,
-    serialFormat: BinaryFormat
-) = configureReadStandardCrudRepoRoutes(originalRepo) {
-    serialFormat.decodeHex(idsSerializer, it)
-}

repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/crud/NewKtorStandardCrudRepo.kt

@@ -1,34 +0,0 @@
-package dev.inmo.micro_utils.repos.ktor.server.crud
-
-import dev.inmo.micro_utils.ktor.common.*
-import dev.inmo.micro_utils.ktor.server.UnifiedRouter
-import dev.inmo.micro_utils.ktor.server.standardKtorSerialFormatContentType
-import dev.inmo.micro_utils.repos.StandardCRUDRepo
-import io.ktor.http.ContentType
-import io.ktor.server.routing.Route
-import io.ktor.server.routing.route
-import kotlinx.serialization.*
-
-inline fun <reified ObjectType : Any, reified IdType : Any, reified InputValue : Any> Route.configureStandardCrudRepoRoutes(
-    originalRepo: StandardCRUDRepo<ObjectType, IdType, InputValue>,
-    noinline idDeserializer: suspend (String) -> IdType
-) {
-    configureReadStandardCrudRepoRoutes(originalRepo, idDeserializer)
-    configureWriteStandardCrudRepoRoutes(originalRepo)
-}
-
-inline fun <reified ObjectType : Any, reified IdType : Any, reified InputValue : Any> Route.configureStandardCrudRepoRoutes(
-    originalRepo: StandardCRUDRepo<ObjectType, IdType, InputValue>,
-    idsSerializer: KSerializer<IdType>,
-    serialFormat: StringFormat
-) = configureStandardCrudRepoRoutes(originalRepo) {
-    serialFormat.decodeFromString(idsSerializer, it)
-}
-
-inline fun <reified ObjectType : Any, reified IdType : Any, reified InputValue : Any> Route.configureStandardCrudRepoRoutes(
-    originalRepo: StandardCRUDRepo<ObjectType, IdType, InputValue>,
-    idsSerializer: KSerializer<IdType>,
-    serialFormat: BinaryFormat
-) = configureStandardCrudRepoRoutes(originalRepo) {
-    serialFormat.decodeHex(idsSerializer, it)
-}

repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/crud/NewKtorWriteStandardCrudRepo.kt

@@ -1,39 +0,0 @@
-package dev.inmo.micro_utils.repos.ktor.server.crud
-
-import dev.inmo.micro_utils.ktor.server.*
-import dev.inmo.micro_utils.repos.WriteStandardCRUDRepo
-import dev.inmo.micro_utils.repos.ktor.common.crud.*
-import io.ktor.server.application.call
-import io.ktor.server.request.receive
-import io.ktor.server.response.respond
-import io.ktor.server.routing.Route
-import io.ktor.server.routing.post
-
-inline fun <reified ObjectType : Any, reified IdType : Any, reified InputValue : Any> Route.configureWriteStandardCrudRepoRoutes(
-    originalRepo: WriteStandardCRUDRepo<ObjectType, IdType, InputValue>
-) {
-    includeWebsocketHandling(
-        newObjectsFlowRouting,
-        originalRepo.newObjectsFlow,
-    )
-    includeWebsocketHandling(
-        updatedObjectsFlowRouting,
-        originalRepo.updatedObjectsFlow
-    )
-    includeWebsocketHandling(
-        deletedObjectsIdsFlowRouting,
-        originalRepo.deletedObjectsIdsFlow
-    )
-
-    post(createRouting) {
-        call.respond(originalRepo.create(call.receive()))
-    }
-
-    post(updateManyRouting) {
-        call.respond(originalRepo.update(call.receive()))
-    }
-
-    post(deleteByIdRouting) {
-        call.respond(originalRepo.deleteById(call.receive()))
-    }
-}

repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/key_value/KtorStandartKeyValueRepo.kt

@@ -6,8 +6,8 @@ import dev.inmo.micro_utils.ktor.server.UnifiedRouter
 import dev.inmo.micro_utils.ktor.server.standardKtorSerialFormatContentType
 import dev.inmo.micro_utils.repos.StandardKeyValueRepo
 import io.ktor.http.ContentType
-import io.ktor.server.routing.Route
-import io.ktor.server.routing.route
+import io.ktor.routing.Route
+import io.ktor.routing.route
 import kotlinx.serialization.KSerializer
 
 fun <K, V> Route.configureStandardKeyValueRepoRoutes(
@@ -43,4 +43,4 @@ fun <K, V> Route.configureStandartKeyValueRepoRoutes(
     valueNullableSerializer: KSerializer<V?>,
     serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat,
     serialFormatContentType: ContentType = standardKtorSerialFormatContentType
-) = configureStandardKeyValueRepoRoutes(baseSubpart, originalRepo, keySerializer, valueSerializer, valueNullableSerializer, UnifiedRouter(serialFormat, serialFormatContentType))
+) = configureStandardKeyValueRepoRoutes(baseSubpart, originalRepo, keySerializer, valueSerializer, valueNullableSerializer, UnifiedRouter(serialFormat, serialFormatContentType))

repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/key_value/KtorStandartReadKeyValueRepo.kt

@@ -8,10 +8,10 @@ import dev.inmo.micro_utils.pagination.extractPagination
 import dev.inmo.micro_utils.repos.ReadStandardKeyValueRepo
 import dev.inmo.micro_utils.repos.ktor.common.key_value.*
 import dev.inmo.micro_utils.repos.ktor.common.valueParameterName
+import io.ktor.application.call
 import io.ktor.http.ContentType
-import io.ktor.server.application.call
-import io.ktor.server.routing.Route
-import io.ktor.server.routing.get
+import io.ktor.routing.Route
+import io.ktor.routing.get
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.serializer
 

repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/key_value/KtorStandartWriteKeyValueRepo.kt

@@ -6,8 +6,8 @@ import dev.inmo.micro_utils.ktor.server.*
 import dev.inmo.micro_utils.repos.WriteStandardKeyValueRepo
 import dev.inmo.micro_utils.repos.ktor.common.key_value.*
 import io.ktor.http.ContentType
-import io.ktor.server.routing.Route
-import io.ktor.server.routing.post
+import io.ktor.routing.Route
+import io.ktor.routing.post
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.*
 

repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/key_value/NewKtorStandartKeyValueRepo.kt

@@ -1,58 +0,0 @@
-package dev.inmo.micro_utils.repos.ktor.server.key_value
-
-import dev.inmo.micro_utils.ktor.common.*
-import dev.inmo.micro_utils.ktor.server.*
-import dev.inmo.micro_utils.pagination.PaginationResult
-import dev.inmo.micro_utils.pagination.extractPagination
-import dev.inmo.micro_utils.repos.StandardCRUDRepo
-import dev.inmo.micro_utils.repos.StandardKeyValueRepo
-import dev.inmo.micro_utils.repos.ktor.common.idParameterName
-import dev.inmo.micro_utils.repos.ktor.common.key_value.*
-import dev.inmo.micro_utils.repos.ktor.common.valueParameterName
-import io.ktor.http.*
-import io.ktor.server.application.call
-import io.ktor.server.response.respond
-import io.ktor.server.routing.Route
-import io.ktor.server.routing.get
-import kotlinx.serialization.*
-import kotlinx.serialization.builtins.serializer
-
-inline fun <reified Key : Any, reified Value : Any> Route.configureStandardKeyValueRepoRoutes (
-    originalRepo: StandardKeyValueRepo<Key, Value>,
-    noinline idDeserializer: suspend (String) -> Key,
-    noinline valueDeserializer: suspend (String) -> Value
-) {
-    configureReadStandardKeyValueRepoRoutes(originalRepo, idDeserializer, valueDeserializer)
-    configureWriteStandardKeyValueRepoRoutes(originalRepo)
-}
-
-inline fun <reified Key : Any, reified Value : Any> Route.configureStandardKeyValueRepoRoutes(
-    originalRepo: StandardKeyValueRepo<Key, Value>,
-    idsSerializer: DeserializationStrategy<Key>,
-    valueSerializer: DeserializationStrategy<Value>,
-    serialFormat: StringFormat
-) = configureStandardKeyValueRepoRoutes(
-    originalRepo,
-    {
-        serialFormat.decodeFromString(idsSerializer, it.decodeURLQueryComponent())
-    },
-    {
-        serialFormat.decodeFromString(valueSerializer, it.decodeURLQueryComponent())
-    }
-)
-
-inline fun <reified Key : Any, reified Value : Any> Route.configureStandardKeyValueRepoRoutes(
-    originalRepo: StandardKeyValueRepo<Key, Value>,
-    idsSerializer: DeserializationStrategy<Key>,
-    valueSerializer: DeserializationStrategy<Value>,
-    serialFormat: BinaryFormat
-) = configureStandardKeyValueRepoRoutes(
-    originalRepo,
-    {
-        serialFormat.decodeHex(idsSerializer, it)
-    },
-    {
-        serialFormat.decodeHex(valueSerializer, it)
-    }
-)
-

repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/key_value/NewKtorStandartReadKeyValueRepo.kt

@@ -1,104 +0,0 @@
-package dev.inmo.micro_utils.repos.ktor.server.key_value
-
-import dev.inmo.micro_utils.ktor.common.*
-import dev.inmo.micro_utils.ktor.server.*
-import dev.inmo.micro_utils.pagination.PaginationResult
-import dev.inmo.micro_utils.pagination.extractPagination
-import dev.inmo.micro_utils.repos.ReadStandardCRUDRepo
-import dev.inmo.micro_utils.repos.ReadStandardKeyValueRepo
-import dev.inmo.micro_utils.repos.ktor.common.idParameterName
-import dev.inmo.micro_utils.repos.ktor.common.key_value.*
-import dev.inmo.micro_utils.repos.ktor.common.valueParameterName
-import io.ktor.http.*
-import io.ktor.server.application.call
-import io.ktor.server.response.respond
-import io.ktor.server.response.responseType
-import io.ktor.server.routing.Route
-import io.ktor.server.routing.get
-import io.ktor.util.InternalAPI
-import io.ktor.util.reflect.typeInfo
-import kotlinx.serialization.*
-import kotlinx.serialization.builtins.serializer
-
-@OptIn(InternalAPI::class)
-inline fun <reified Key, reified Value> Route.configureReadStandardKeyValueRepoRoutes (
-    originalRepo: ReadStandardKeyValueRepo<Key, Value>,
-    noinline idDeserializer: suspend (String) -> Key,
-    noinline valueDeserializer: suspend (String) -> Value
-) {
-    get(getRoute) {
-        val key = idDeserializer(
-            call.getQueryParameterOrSendError(idParameterName) ?: return@get
-        )
-
-        originalRepo.get(key) ?.let {
-            call.respond(it)
-        } ?: call.respond(HttpStatusCode.NoContent)
-    }
-
-    val paginationWithValuesTypeInfo = typeInfo<PaginationResult<Value>>()
-    get(valuesRoute) {
-        val pagination = call.request.queryParameters.extractPagination
-        val reversed = call.getQueryParameter(reversedParameterName) ?.toBoolean() ?: false
-
-        call.response.responseType = paginationWithValuesTypeInfo
-        call.response.pipeline.execute(call, originalRepo.values(pagination, reversed) as Any)
-    }
-
-    get(keysRoute) {
-        val pagination = call.request.queryParameters.extractPagination
-        val reversed = call.getQueryParameterOrSendError(reversedParameterName) ?.toBoolean() ?: false
-        val value = call.getQueryParameter(valueParameterName) ?.let {
-            valueDeserializer(it)
-        }
-
-        call.respond(
-            value ?.let { originalRepo.keys(value, pagination, reversed) } ?: originalRepo.keys(pagination, reversed)
-        )
-    }
-
-    get(containsRoute) {
-        val key = idDeserializer(
-            call.getQueryParameterOrSendError(idParameterName) ?: return@get
-        )
-
-        call.respond(
-            originalRepo.contains(key)
-        )
-    }
-
-    get(countRoute) {
-        call.respond(originalRepo.count())
-    }
-}
-
-inline fun <reified Key, reified Value> Route.configureReadStandardKeyValueRepoRoutes(
-    originalRepo: ReadStandardKeyValueRepo<Key, Value>,
-    idsSerializer: DeserializationStrategy<Key>,
-    valueSerializer: DeserializationStrategy<Value>,
-    serialFormat: StringFormat
-) = configureReadStandardKeyValueRepoRoutes(
-    originalRepo,
-    {
-        serialFormat.decodeFromString(idsSerializer, it.decodeURLQueryComponent())
-    },
-    {
-        serialFormat.decodeFromString(valueSerializer, it.decodeURLQueryComponent())
-    }
-)
-
-inline fun <reified Key, reified Value> Route.configureReadStandardKeyValueRepoRoutes(
-    originalRepo: ReadStandardKeyValueRepo<Key, Value>,
-    idsSerializer: DeserializationStrategy<Key>,
-    valueSerializer: DeserializationStrategy<Value>,
-    serialFormat: BinaryFormat
-) = configureReadStandardKeyValueRepoRoutes(
-    originalRepo,
-    {
-        serialFormat.decodeHex(idsSerializer, it)
-    },
-    {
-        serialFormat.decodeHex(valueSerializer, it)
-    }
-)
-

repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/key_value/NewKtorStandartWriteKeyValueRepo.kt

@@ -1,45 +0,0 @@
-package dev.inmo.micro_utils.repos.ktor.server.key_value
-
-import dev.inmo.micro_utils.ktor.server.*
-import dev.inmo.micro_utils.repos.WriteStandardKeyValueRepo
-import dev.inmo.micro_utils.repos.ktor.common.key_value.*
-import io.ktor.http.HttpStatusCode
-import io.ktor.server.application.call
-import io.ktor.server.request.receive
-import io.ktor.server.response.respond
-import io.ktor.server.routing.Route
-import io.ktor.server.routing.post
-import io.ktor.util.reflect.typeInfo
-
-inline fun <reified Key : Any, reified Value : Any> Route.configureWriteStandardKeyValueRepoRoutes (
-    originalRepo: WriteStandardKeyValueRepo<Key, Value>
-) {
-    includeWebsocketHandling(
-        onNewValueRoute,
-        originalRepo.onNewValue
-    )
-
-    includeWebsocketHandling(
-        onValueRemovedRoute,
-        originalRepo.onValueRemoved
-    )
-
-    val mapType = typeInfo<Map<Key, Value>>()
-    val listKeysType = typeInfo<List<Key>>()
-    val listValuesType = typeInfo<List<Value>>()
-
-    post(setRoute) {
-        originalRepo.set(call.receive(mapType))
-        call.respond(HttpStatusCode.OK)
-    }
-
-    post(unsetRoute) {
-        originalRepo.unset(call.receive(listKeysType))
-        call.respond(HttpStatusCode.OK)
-    }
-
-    post(unsetWithValuesRoute) {
-        originalRepo.unsetWithValues(call.receive(listValuesType))
-        call.respond(HttpStatusCode.OK)
-    }
-}

repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/one_to_many/ConfigureOneToManyKeyValueRepoRoutes.kt

@@ -6,8 +6,8 @@ import dev.inmo.micro_utils.ktor.server.UnifiedRouter
 import dev.inmo.micro_utils.ktor.server.standardKtorSerialFormatContentType
 import dev.inmo.micro_utils.repos.OneToManyKeyValueRepo
 import io.ktor.http.ContentType
-import io.ktor.server.routing.Route
-import io.ktor.server.routing.route
+import io.ktor.routing.Route
+import io.ktor.routing.route
 import kotlinx.serialization.KSerializer
 
 fun <Key, Value> Route.configureOneToManyKeyValueRepoRoutes(
@@ -32,4 +32,4 @@ fun <Key, Value> Route.configureOneToManyKeyValueRepoRoutes(
     serialFormatContentType: ContentType = standardKtorSerialFormatContentType
 ) = configureOneToManyKeyValueRepoRoutes(
     baseSubpart, originalRepo, keySerializer, valueSerializer, UnifiedRouter(serialFormat, serialFormatContentType)
-)
+)

repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/one_to_many/ConfigureOneToManyReadKeyValueRepoRoutes.kt

@@ -6,14 +6,15 @@ import dev.inmo.micro_utils.ktor.server.*
 import dev.inmo.micro_utils.pagination.PaginationResult
 import dev.inmo.micro_utils.pagination.extractPagination
 import dev.inmo.micro_utils.repos.ReadOneToManyKeyValueRepo
+import dev.inmo.micro_utils.repos.ktor.common.*
 import dev.inmo.micro_utils.repos.ktor.common.keyParameterName
 import dev.inmo.micro_utils.repos.ktor.common.one_to_many.*
 import dev.inmo.micro_utils.repos.ktor.common.valueParameterName
 import dev.inmo.micro_utils.repos.ktor.common.reversedParameterName
+import io.ktor.application.call
 import io.ktor.http.ContentType
-import io.ktor.server.application.call
-import io.ktor.server.routing.Route
-import io.ktor.server.routing.get
+import io.ktor.routing.Route
+import io.ktor.routing.get
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.serializer
 

repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/one_to_many/ConfigureOneToManyWriteKeyValueRepoRoutes.kt

@@ -5,9 +5,10 @@ import dev.inmo.micro_utils.ktor.common.standardKtorSerialFormat
 import dev.inmo.micro_utils.ktor.server.*
 import dev.inmo.micro_utils.repos.WriteOneToManyKeyValueRepo
 import dev.inmo.micro_utils.repos.ktor.common.one_to_many.*
+import io.ktor.application.call
 import io.ktor.http.ContentType
-import io.ktor.server.routing.Route
-import io.ktor.server.routing.post
+import io.ktor.routing.Route
+import io.ktor.routing.post
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.*