Merge branch 'master' into key_value_impl

utils/repos/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/utils/repos/ktor/client/crud/KtorReadStandardCrudRepo.kt

@@ -1,6 +1,7 @@
 package com.insanusmokrassar.postssystem.utils.repos.ktor.client.crud
 
 import com.insanusmokrassar.postssystem.ktor.*
+import com.insanusmokrassar.postssystem.ktor.client.encodeUrlQueryValue
 import com.insanusmokrassar.postssystem.ktor.client.uniget
 import com.insanusmokrassar.postssystem.utils.common.pagination.Pagination
 import com.insanusmokrassar.postssystem.utils.common.pagination.PaginationResult
@@ -29,7 +30,7 @@ class KtorReadStandardCrudRepo<ObjectType, IdType> (
             baseUrl,
             getByIdRouting,
             mapOf(
-                "id" to id.toHex(idsSerializer)
+                "id" to idsSerializer.encodeUrlQueryValue(id)
             )
         ),
         objectsSerializerNullable
@@ -40,7 +41,7 @@ class KtorReadStandardCrudRepo<ObjectType, IdType> (
             baseUrl,
             containsRouting,
             mapOf(
-                "id" to id.toHex(idsSerializer)
+                "id" to idsSerializer.encodeUrlQueryValue(id)
             )
         ),
         Boolean.serializer()

utils/repos/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/utils/repos/ktor/client/one_to_many/KtorOneToManyReadKeyValueRepo.kt

@@ -1,6 +1,7 @@
 package com.insanusmokrassar.postssystem.utils.repos.ktor.client.one_to_many
 
 import com.insanusmokrassar.postssystem.ktor.*
+import com.insanusmokrassar.postssystem.ktor.client.encodeUrlQueryValue
 import com.insanusmokrassar.postssystem.ktor.client.uniget
 import com.insanusmokrassar.postssystem.utils.common.pagination.Pagination
 import com.insanusmokrassar.postssystem.utils.common.pagination.PaginationResult
@@ -24,8 +25,8 @@ class KtorOneToManyReadKeyValueRepo<Key, Value> (
             baseUrl,
             getRoute,
             mapOf(
-                keyParameterName to k.toHex(keySerializer),
-                reversedParameterName to reversed.toHex(Boolean.serializer())
+                keyParameterName to keySerializer.encodeUrlQueryValue(k),
+                reversedParameterName to Boolean.serializer().encodeUrlQueryValue(reversed)
             ) + pagination.asUrlQueryParts
         ),
         paginationValueResultSerializer
@@ -36,7 +37,7 @@ class KtorOneToManyReadKeyValueRepo<Key, Value> (
             baseUrl,
             keysRoute,
             mapOf(
-                reversedParameterName to reversed.toHex(Boolean.serializer())
+                reversedParameterName to Boolean.serializer().encodeUrlQueryValue(reversed)
             ) + pagination.asUrlQueryParts
         ),
         paginationKeyResultSerializer
@@ -46,7 +47,7 @@ class KtorOneToManyReadKeyValueRepo<Key, Value> (
         buildStandardUrl(
             baseUrl,
             containsByKeyRoute,
-            mapOf(keyParameterName to k.toHex(keySerializer))
+            mapOf(keyParameterName to keySerializer.encodeUrlQueryValue(k))
         ),
         Boolean.serializer()
     )
@@ -56,8 +57,8 @@ class KtorOneToManyReadKeyValueRepo<Key, Value> (
             baseUrl,
             containsByKeyValueRoute,
             mapOf(
-                keyParameterName to k.toHex(keySerializer),
-                valueParameterName to v.toHex(valueSerializer),
+                keyParameterName to keySerializer.encodeUrlQueryValue(k),
+                valueParameterName to valueSerializer.encodeUrlQueryValue(v),
             )
         ),
         Boolean.serializer()
@@ -68,7 +69,7 @@ class KtorOneToManyReadKeyValueRepo<Key, Value> (
             baseUrl,
             countByKeyRoute,
             mapOf(
-                keyParameterName to k.toHex(keySerializer)
+                keyParameterName to keySerializer.encodeUrlQueryValue(k)
             )
         ),
         Long.serializer()

utils/repos/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/utils/repos/ktor/server/crud/KtorReadStandardCrudRepo.kt

@@ -28,7 +28,7 @@ fun <ObjectType, IdType> Route.configureReadStandardCrudRepoRoutes(
     }
 
     get(getByIdRouting) {
-        val id = call.uniloadFromQueryOrSendError(
+        val id = call.decodeUrlQueryValueOrSendError(
             "id",
             idsSerializer
         ) ?: return@get
@@ -40,7 +40,7 @@ fun <ObjectType, IdType> Route.configureReadStandardCrudRepoRoutes(
     }
 
     get(containsRouting) {
-        val id = call.uniloadFromQueryOrSendError(
+        val id = call.decodeUrlQueryValueOrSendError(
             "id",
             idsSerializer
         ) ?: return@get

utils/repos/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/utils/repos/ktor/server/one_to_many/ConfigureOneToManyReadKeyValueRepoRoutes.kt

@@ -22,11 +22,11 @@ fun <Key, Value> Route.configureOneToManyReadKeyValueRepoRoutes(
 
     get(getRoute) {
         val pagination = call.request.queryParameters.extractPagination
-        val key = call.uniloadFromQueryOrSendError(
+        val key = call.decodeUrlQueryValueOrSendError(
             keyParameterName,
             keySerializer
         ) ?: return@get
-        val reversed = call.uniloadFromQuery(
+        val reversed = call.decodeUrlQueryValue(
             reversedParameterName,
             Boolean.serializer()
         ) ?: false
@@ -39,7 +39,7 @@ fun <Key, Value> Route.configureOneToManyReadKeyValueRepoRoutes(
 
     get(keysRoute) {
         val pagination = call.request.queryParameters.extractPagination
-        val reversed = call.uniloadFromQuery(
+        val reversed = call.decodeUrlQueryValue(
             reversedParameterName,
             Boolean.serializer()
         ) ?: false
@@ -51,10 +51,10 @@ fun <Key, Value> Route.configureOneToManyReadKeyValueRepoRoutes(
     }
 
     get(containsByKeyRoute) {
-        val key = standardKtorSerialFormat.decodeFromHexString(
-            keySerializer,
-            call.getQueryParameterOrSendError(keyParameterName) ?: return@get
-        )
+        val key = call.decodeUrlQueryValueOrSendError(
+            keyParameterName,
+            keySerializer
+        ) ?: return@get
 
         call.unianswer(
             Boolean.serializer(),
@@ -63,11 +63,11 @@ fun <Key, Value> Route.configureOneToManyReadKeyValueRepoRoutes(
     }
 
     get(containsByKeyValueRoute) {
-        val key = call.uniloadFromQueryOrSendError(
+        val key = call.decodeUrlQueryValueOrSendError(
             keyParameterName,
             keySerializer
         ) ?: return@get
-        val value = call.uniloadFromQueryOrSendError(
+        val value = call.decodeUrlQueryValueOrSendError(
             valueParameterName,
             valueSealizer
         ) ?: return@get
@@ -79,7 +79,7 @@ fun <Key, Value> Route.configureOneToManyReadKeyValueRepoRoutes(
     }
 
     get(countByKeyRoute) {
-        val key = call.uniloadFromQueryOrSendError(
+        val key = call.decodeUrlQueryValueOrSendError(
             keyParameterName,
             keySerializer
         ) ?: return@get