replacement of doForAll and getAll

CHANGELOG.md

@@ -10,22 +10,21 @@
     * Extension `PaginationResult.thisPageIfNotEmpty` now is typed and will return `PaginationResult?` with the same
     generic type as income `PaginationResult`
     * New extension `PaginationResult.currentPageIfNotEmpty` - shortcut for `PaginationResult.thisPageIfNotEmpty`
+    * New common functions. They were created as replacements for currently available for more comfortable work
+    with repos pagination:
+        * `doForAll`
+        * `doForAllWithNextPaging`
+        * `doForAllWithCurrentPaging`
+        * `getAll`
+        * `getAllWithNextPaging`
+        * `getAllWithCurrentPaging`
 * `Coroutines`:
     * Rewrite `subscribeSafelyWithoutExceptions`
         * Now `subscribeSafelyWithoutExceptions` will use default handler instead of skipping
     * New extension `subscribeSafelySkippingExceptions`
 * `Repos`
     * New subproject `repos.cache` - this subproject will contain repos with data caching mechanisms
-    * `Pagination`
+    * Most old `doForAll` methods have been deprecated
-        * New common functions. They were created as replacements for currently available for more comfortable work
-        with repos pagination:
-            * `doForAll`
-            * `doForAllWithNextPaging`
-            * `doForAllWithCurrentPaging`
-            * `getAll`
-            * `getAllWithNextPaging`
-            * `getAllWithCurrentPaging`
-        * Most old `doForAll` methods have been deprecated
 
 ## 0.4.30
 

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

@@ -0,0 +1,35 @@
+package dev.inmo.micro_utils.pagination.utils
+
+import dev.inmo.micro_utils.pagination.*
+
+suspend fun <T> doForAll(
+    initialPagination: Pagination = FirstPagePagination(),
+    paginationMapper: (PaginationResult<T>) -> Pagination?,
+    block: suspend (Pagination) -> PaginationResult<T>
+) {
+    doWithPagination(initialPagination) {
+        block(it).let(paginationMapper)
+    }
+}
+
+suspend fun <T> doForAllWithNextPaging(
+    initialPagination: Pagination = FirstPagePagination(),
+    block: suspend (Pagination) -> PaginationResult<T>
+) {
+    doForAll(
+        initialPagination,
+        { it.nextPageIfNotEmpty() },
+        block
+    )
+}
+
+suspend fun <T> doAllWithCurrentPaging(
+    initialPagination: Pagination = FirstPagePagination(),
+    block: suspend (Pagination) -> PaginationResult<T>
+) {
+    doForAll(
+        initialPagination,
+        { it.thisPageIfNotEmpty() },
+        block
+    )
+}

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

@@ -1,39 +1,7 @@
-package dev.inmo.micro_utils.repos.pagination
+package dev.inmo.micro_utils.pagination.utils
 
 import dev.inmo.micro_utils.pagination.*
 
-suspend fun <T> doForAll(
-    initialPagination: Pagination = FirstPagePagination(),
-    paginationMapper: (PaginationResult<T>) -> Pagination?,
-    block: suspend (Pagination) -> PaginationResult<T>
-) {
-    doWithPagination(initialPagination) {
-        block(it).let(paginationMapper)
-    }
-}
-
-suspend fun <T> doForAllWithNextPaging(
-    initialPagination: Pagination = FirstPagePagination(),
-    block: suspend (Pagination) -> PaginationResult<T>
-) {
-    doForAll(
-        initialPagination,
-        { it.nextPageIfNotEmpty() },
-        block
-    )
-}
-
-suspend fun <T> doAllWithCurrentPaging(
-    initialPagination: Pagination = FirstPagePagination(),
-    block: suspend (Pagination) -> PaginationResult<T>
-) {
-    doForAll(
-        initialPagination,
-        { it.thisPageIfNotEmpty() },
-        block
-    )
-}
-
 suspend fun <T> getAll(
     initialPagination: Pagination = FirstPagePagination(),
     paginationMapper: (PaginationResult<T>) -> Pagination?,

repos/cache/src/commonMain/kotlin/dev/inmo/micro_utils/repos/cache/KVCache.kt

@@ -1,7 +1,7 @@
 package dev.inmo.micro_utils.repos.cache
 
 import dev.inmo.micro_utils.repos.*
-import dev.inmo.micro_utils.repos.pagination.getAllWithNextPaging
+import dev.inmo.micro_utils.pagination.utils.getAllWithNextPaging
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 

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

@@ -1,7 +1,7 @@
 package dev.inmo.micro_utils.repos
 
 import dev.inmo.micro_utils.pagination.*
-import dev.inmo.micro_utils.repos.pagination.getAllWithNextPaging
+import dev.inmo.micro_utils.pagination.utils.getAllWithNextPaging
 import kotlinx.coroutines.flow.Flow
 
 interface ReadOneToManyKeyValueRepo<Key, Value> : Repo {

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

@@ -1,7 +1,7 @@
 package dev.inmo.micro_utils.repos
 
 import dev.inmo.micro_utils.pagination.*
-import dev.inmo.micro_utils.repos.pagination.doAllWithCurrentPaging
+import dev.inmo.micro_utils.pagination.utils.doAllWithCurrentPaging
 import kotlinx.coroutines.flow.Flow
 
 interface ReadStandardKeyValueRepo<Key, Value> : Repo {

repos/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/pagination/CRUDPaginationExtensions.kt

@@ -1,6 +1,8 @@
 package dev.inmo.micro_utils.repos.pagination
 
 import dev.inmo.micro_utils.pagination.*
+import dev.inmo.micro_utils.pagination.utils.doForAllWithNextPaging
+import dev.inmo.micro_utils.pagination.utils.getAllWithNextPaging
 import dev.inmo.micro_utils.repos.ReadStandardCRUDRepo
 
 @Deprecated("Will be removed soon due to redundancy. Can be replaced with other doForAll extensions")

repos/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/pagination/KeyValuePaginationExtensions.kt

@@ -1,6 +1,7 @@
 package dev.inmo.micro_utils.repos.pagination
 
 import dev.inmo.micro_utils.pagination.*
+import dev.inmo.micro_utils.pagination.utils.getAllWithNextPaging
 import dev.inmo.micro_utils.repos.ReadStandardKeyValueRepo
 
 @Deprecated("Will be removed soon due to redundancy")

repos/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/pagination/OneToManyPaginationExtensions.kt

@@ -1,6 +1,7 @@
 package dev.inmo.micro_utils.repos.pagination
 
 import dev.inmo.micro_utils.pagination.*
+import dev.inmo.micro_utils.pagination.utils.getAllWithNextPaging
 import dev.inmo.micro_utils.repos.ReadOneToManyKeyValueRepo
 
 @Deprecated("Will be removed soon due to redundancy")