upfix update

0.5.8

.github/workflows/build.yml

@@ -0,0 +1,12 @@
+name: Regular build
+on: [push]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Build
+        run: ./gradlew build

CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## 0.5.9
+
+* `Repos`
+    * `Common`
+        * `OneToManyAndroidRepo` got new primary constructor
+
+## 0.5.8
+
+* `Common`:
+    * New extension `Iterable#firstNotNull`
+* `Coroutines`
+    * New extension `Flow#firstNotNull`
+    * New extensions `CoroutineContext#LinkedSupervisorJob`, `CoroutineScope#LinkedSupervisorJob` and
+      `CoroutineScope#LinkedSupervisorScope`
+
+## 0.5.7
+
+* `Pagination`
+    * `Ktor`
+        * `Server`
+            * Fixes in extension `extractPagination`
+* `Repos`
+    * `Cache`
+        * All standard cache repos have been separated to read and read/write repos
+
 ## 0.5.6
 
 * `Versions`

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

@@ -0,0 +1,3 @@
+package dev.inmo.micro_utils.common
+
+fun <T> Iterable<T?>.firstNotNull() = first { it != null }!!

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

@@ -0,0 +1,6 @@
+package dev.inmo.micro_utils.coroutines
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.first
+
+suspend fun <T> Flow<T?>.firstNotNull() = first { it != null }!!

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

@@ -0,0 +1,17 @@
+package dev.inmo.micro_utils.coroutines
+
+import kotlinx.coroutines.*
+import kotlin.coroutines.CoroutineContext
+
+fun CoroutineContext.LinkedSupervisorJob(
+    additionalContext: CoroutineContext? = null
+) = SupervisorJob(job).let { if (additionalContext != null) it + additionalContext else it }
+fun CoroutineScope.LinkedSupervisorJob(
+    additionalContext: CoroutineContext? = null
+) = coroutineContext.LinkedSupervisorJob(additionalContext)
+
+fun CoroutineScope.LinkedSupervisorScope(
+    additionalContext: CoroutineContext? = null
+) = CoroutineScope(
+    coroutineContext + LinkedSupervisorJob(additionalContext)
+)

gradle.properties

@@ -45,5 +45,5 @@ dokka_version=1.4.32
 # Project data
 
 group=dev.inmo
-version=0.5.6
-android_code_version=47
+version=0.5.9
+android_code_version=50

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

@@ -5,8 +5,8 @@ import io.ktor.http.Parameters
 
 val Parameters.extractPagination: Pagination
     get() = SimplePagination(
-        get("page") ?.toIntOrNull() ?: 0,
-        get("size") ?.toIntOrNull() ?: defaultPaginationPageSize
+        get(paginationPageKey) ?.toIntOrNull() ?: 0,
+        get(paginationSizeKey) ?.toIntOrNull() ?: defaultPaginationPageSize
     )
 
 val ApplicationCall.extractPagination: Pagination

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

@@ -6,19 +6,29 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 
-open class CRUDCacheRepo<ObjectType, IdType, InputValueType>(
-    protected val parentRepo: CRUDRepo<ObjectType, IdType, InputValueType>,
+open class ReadCRUDCacheRepo<ObjectType, IdType>(
+    protected val parentRepo: ReadCRUDRepo<ObjectType, IdType>,
     protected val kvCache: KVCache<IdType, ObjectType>,
-    scope: CoroutineScope = CoroutineScope(Dispatchers.Default),
     protected val idGetter: (ObjectType) -> IdType
-) : CRUDRepo<ObjectType, IdType, InputValueType> by parentRepo {
-    protected val onNewJob = parentRepo.newObjectsFlow.onEach { kvCache.set(idGetter(it), it) }.launchIn(scope)
-    protected val onUpdatedJob = parentRepo.updatedObjectsFlow.onEach { kvCache.set(idGetter(it), it) }.launchIn(scope)
-    protected val onRemoveJob = parentRepo.deletedObjectsIdsFlow.onEach { kvCache.unset(it) }.launchIn(scope)
-
+) : ReadCRUDRepo<ObjectType, IdType> by parentRepo {
     override suspend fun getById(id: IdType): ObjectType? = kvCache.get(id) ?: (parentRepo.getById(id) ?.also {
         kvCache.set(id, it)
     })
 
     override suspend fun contains(id: IdType): Boolean = kvCache.contains(id) || parentRepo.contains(id)
 }
+
+open class CRUDCacheRepo<ObjectType, IdType, InputValueType>(
+    parentRepo: CRUDRepo<ObjectType, IdType, InputValueType>,
+    kvCache: KVCache<IdType, ObjectType>,
+    scope: CoroutineScope = CoroutineScope(Dispatchers.Default),
+    idGetter: (ObjectType) -> IdType
+) : ReadCRUDCacheRepo<ObjectType, IdType>(
+    parentRepo,
+    kvCache,
+    idGetter
+), CRUDRepo<ObjectType, IdType, InputValueType>, WriteCRUDRepo<ObjectType, IdType, InputValueType> by parentRepo {
+    protected val onNewJob = parentRepo.newObjectsFlow.onEach { kvCache.set(idGetter(it), it) }.launchIn(scope)
+    protected val onUpdatedJob = parentRepo.updatedObjectsFlow.onEach { kvCache.set(idGetter(it), it) }.launchIn(scope)
+    protected val onRemoveJob = parentRepo.deletedObjectsIdsFlow.onEach { kvCache.unset(it) }.launchIn(scope)
+}

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

@@ -7,14 +7,19 @@ import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 
-open class KeyValueCacheRepo<Key,Value>(
-    protected val parentRepo: KeyValueRepo<Key, Value>,
+open class ReadKeyValueCacheRepo<Key,Value>(
+    protected val parentRepo: ReadKeyValueRepo<Key, Value>,
     protected val kvCache: KVCache<Key, Value>,
-    scope: CoroutineScope = CoroutineScope(Dispatchers.Default)
-) : KeyValueRepo<Key,Value> by parentRepo {
-    protected val onNewJob = parentRepo.onNewValue.onEach { kvCache.set(it.first, it.second) }.launchIn(scope)
-    protected val onRemoveJob = parentRepo.onValueRemoved.onEach { kvCache.unset(it) }.launchIn(scope)
-
+) : ReadKeyValueRepo<Key,Value> by parentRepo {
     override suspend fun get(k: Key): Value? = kvCache.get(k) ?: parentRepo.get(k) ?.also { kvCache.set(k, it) }
     override suspend fun contains(key: Key): Boolean = kvCache.contains(key) || parentRepo.contains(key)
 }
+
+open class KeyValueCacheRepo<Key,Value>(
+    parentRepo: KeyValueRepo<Key, Value>,
+    kvCache: KVCache<Key, Value>,
+    scope: CoroutineScope = CoroutineScope(Dispatchers.Default)
+) : ReadKeyValueCacheRepo<Key,Value>(parentRepo, kvCache), KeyValueRepo<Key,Value>, WriteKeyValueRepo<Key, Value> by parentRepo {
+    protected val onNewJob = parentRepo.onNewValue.onEach { kvCache.set(it.first, it.second) }.launchIn(scope)
+    protected val onRemoveJob = parentRepo.onValueRemoved.onEach { kvCache.unset(it) }.launchIn(scope)
+}

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

@@ -11,15 +11,10 @@ import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 
-open class KeyValuesCacheRepo<Key,Value>(
-    protected val parentRepo: KeyValuesRepo<Key, Value>,
-    protected val kvCache: KVCache<Key, List<Value>>,
-    scope: CoroutineScope = CoroutineScope(Dispatchers.Default)
-) : KeyValuesRepo<Key,Value> by parentRepo {
-    protected val onNewJob = parentRepo.onNewValue.onEach { kvCache.set(it.first, kvCache.get(it.first) ?.plus(it.second) ?: listOf(it.second)) }.launchIn(scope)
-    protected val onRemoveJob = parentRepo.onValueRemoved.onEach { kvCache.set(it.first, kvCache.get(it.first) ?.minus(it.second) ?: return@onEach) }.launchIn(scope)
-    protected val onDataClearedJob = parentRepo.onDataCleared.onEach { kvCache.unset(it) }.launchIn(scope)
-
+open class ReadKeyValuesCacheRepo<Key,Value>(
+    protected val parentRepo: ReadKeyValuesRepo<Key, Value>,
+    protected val kvCache: KVCache<Key, List<Value>>
+) : ReadKeyValuesRepo<Key,Value> by parentRepo {
     override suspend fun get(k: Key, pagination: Pagination, reversed: Boolean): PaginationResult<Value> {
         return kvCache.get(k) ?.paginate(
             pagination.let { if (reversed) it.reverse(count(k)) else it }
@@ -35,3 +30,13 @@ open class KeyValuesCacheRepo<Key,Value>(
     override suspend fun contains(k: Key, v: Value): Boolean = kvCache.get(k) ?.contains(v) ?: parentRepo.contains(k, v)
     override suspend fun contains(k: Key): Boolean = kvCache.contains(k) || parentRepo.contains(k)
 }
+
+open class KeyValuesCacheRepo<Key,Value>(
+    parentRepo: KeyValuesRepo<Key, Value>,
+    kvCache: KVCache<Key, List<Value>>,
+    scope: CoroutineScope = CoroutineScope(Dispatchers.Default)
+) : ReadKeyValuesCacheRepo<Key,Value>(parentRepo, kvCache), KeyValuesRepo<Key,Value>, WriteKeyValuesRepo<Key,Value> by parentRepo {
+    protected val onNewJob = parentRepo.onNewValue.onEach { kvCache.set(it.first, kvCache.get(it.first) ?.plus(it.second) ?: listOf(it.second)) }.launchIn(scope)
+    protected val onRemoveJob = parentRepo.onValueRemoved.onEach { kvCache.set(it.first, kvCache.get(it.first) ?.minus(it.second) ?: return@onEach) }.launchIn(scope)
+    protected val onDataClearedJob = parentRepo.onDataCleared.onEach { kvCache.unset(it) }.launchIn(scope)
+}

repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/onetomany/OneToManyAndroidRepo.kt

@@ -20,10 +20,14 @@ private val internalSerialFormat = Json {
     ignoreUnknownKeys = true
 }
 
+typealias KeyValuesAndroidRepo<Key, Value> = OneToManyAndroidRepo<Key, Value>
+
 class OneToManyAndroidRepo<Key, Value>(
     private val tableName: String,
-    private val keySerializer: KSerializer<Key>,
-    private val valueSerializer: KSerializer<Value>,
+    private val keyAsString: Key.() -> String,
+    private val valueAsString: Value.() -> String,
+    private val keyFromString: String.() -> Key,
+    private val valueFromString: String.() -> Value,
     private val helper: SQLiteOpenHelper
 ) : OneToManyKeyValueRepo<Key, Value> {
     private val _onNewValue: MutableSharedFlow<Pair<Key, Value>> = MutableSharedFlow()
@@ -36,11 +40,6 @@ class OneToManyAndroidRepo<Key, Value>(
     private val idColumnName = "id"
     private val valueColumnName = "value"
 
-    private fun Key.asId() = internalSerialFormat.encodeToString(keySerializer, this)
-    private fun Value.asValue() = internalSerialFormat.encodeToString(valueSerializer, this)
-    private fun String.asValue(): Value = internalSerialFormat.decodeFromString(valueSerializer, this)
-    private fun String.asKey(): Key = internalSerialFormat.decodeFromString(keySerializer, this)
-
     init {
         helper.blockingWritableTransaction {
             createTable(
@@ -61,8 +60,8 @@ class OneToManyAndroidRepo<Key, Value>(
                         tableName,
                         null,
                         contentValuesOf(
-                            idColumnName to k.asId(),
-                            valueColumnName to v.asValue()
+                            idColumnName to k.keyAsString(),
+                            valueColumnName to v.valueAsString()
                         )
                     ).also {
                         if (it != -1L) {
@@ -77,7 +76,7 @@ class OneToManyAndroidRepo<Key, Value>(
 
     override suspend fun clear(k: Key) {
         helper.blockingWritableTransaction {
-            delete(tableName, "$idColumnName=?", arrayOf(k.asId()))
+            delete(tableName, "$idColumnName=?", arrayOf(k.keyAsString()))
         }.also {
             if (it > 0) {
                 _onDataCleared.emit(k)
@@ -88,7 +87,7 @@ class OneToManyAndroidRepo<Key, Value>(
     override suspend fun set(toSet: Map<Key, List<Value>>) {
         val (clearedKeys, inserted) = helper.blockingWritableTransaction {
             toSet.mapNotNull { (k, _) ->
-                if (delete(tableName, "$idColumnName=?", arrayOf(k.asId())) > 0) {
+                if (delete(tableName, "$idColumnName=?", arrayOf(k.keyAsString())) > 0) {
                     k
                 } else {
                     null
@@ -98,7 +97,7 @@ class OneToManyAndroidRepo<Key, Value>(
                     insert(
                         tableName,
                         null,
-                        contentValuesOf(idColumnName to k.asId(), valueColumnName to v.asValue())
+                        contentValuesOf(idColumnName to k.keyAsString(), valueColumnName to v.valueAsString())
                     )
                     k to v
                 }
@@ -109,7 +108,7 @@ class OneToManyAndroidRepo<Key, Value>(
     }
 
     override suspend fun contains(k: Key): Boolean = helper.blockingReadableTransaction {
-        select(tableName, selection = "$idColumnName=?", selectionArgs = arrayOf(k.asId()), limit = FirstPagePagination(1).limitClause()).use {
+        select(tableName, selection = "$idColumnName=?", selectionArgs = arrayOf(k.keyAsString()), limit = FirstPagePagination(1).limitClause()).use {
             it.count > 0
         }
     }
@@ -118,7 +117,7 @@ class OneToManyAndroidRepo<Key, Value>(
         select(
             tableName,
             selection = "$idColumnName=? AND $valueColumnName=?",
-            selectionArgs = arrayOf(k.asId(), v.asValue()),
+            selectionArgs = arrayOf(k.keyAsString(), v.valueAsString()),
             limit = FirstPagePagination(1).limitClause()
         ).use {
             it.count > 0
@@ -134,7 +133,7 @@ class OneToManyAndroidRepo<Key, Value>(
     }.toLong()
 
     override suspend fun count(k: Key): Long = helper.blockingReadableTransaction {
-        select(tableName, selection = "$idColumnName=?", selectionArgs = arrayOf(k.asId()), limit = FirstPagePagination(1).limitClause()).use {
+        select(tableName, selection = "$idColumnName=?", selectionArgs = arrayOf(k.keyAsString()), limit = FirstPagePagination(1).limitClause()).use {
             it.count
         }
     }.toLong()
@@ -149,13 +148,13 @@ class OneToManyAndroidRepo<Key, Value>(
             select(
                 tableName,
                 selection = "$idColumnName=?",
-                selectionArgs = arrayOf(k.asId()),
+                selectionArgs = arrayOf(k.keyAsString()),
                 limit = resultPagination.limitClause()
             ).use { c ->
                 mutableListOf<Value>().also {
                     if (c.moveToFirst()) {
                         do {
-                            it.add(c.getString(valueColumnName).asValue())
+                            it.add(c.getString(valueColumnName).valueFromString())
                         } while (c.moveToNext())
                     }
                 }
@@ -179,7 +178,7 @@ class OneToManyAndroidRepo<Key, Value>(
                 mutableListOf<Key>().also {
                     if (c.moveToFirst()) {
                         do {
-                            it.add(c.getString(idColumnName).asKey())
+                            it.add(c.getString(idColumnName).keyFromString())
                         } while (c.moveToNext())
                     }
                 }
@@ -200,13 +199,13 @@ class OneToManyAndroidRepo<Key, Value>(
             select(
                 tableName,
                 selection = "$valueColumnName=?",
-                selectionArgs = arrayOf(v.asValue()),
+                selectionArgs = arrayOf(v.valueAsString()),
                 limit = resultPagination.limitClause()
             ).use { c ->
                 mutableListOf<Key>().also {
                     if (c.moveToFirst()) {
                         do {
-                            it.add(c.getString(idColumnName).asKey())
+                            it.add(c.getString(idColumnName).keyFromString())
                         } while (c.moveToNext())
                     }
                 }
@@ -221,7 +220,7 @@ class OneToManyAndroidRepo<Key, Value>(
         helper.blockingWritableTransaction {
             toRemove.flatMap { (k, vs) ->
                 vs.mapNotNullA { v ->
-                    if (delete(tableName, "$idColumnName=? AND $valueColumnName=?", arrayOf(k.asId(), v.asValue())) > 0) {
+                    if (delete(tableName, "$idColumnName=? AND $valueColumnName=?", arrayOf(k.keyAsString(), v.valueAsString())) > 0) {
                         k to v
                     } else {
                         null
@@ -233,3 +232,24 @@ class OneToManyAndroidRepo<Key, Value>(
         }
     }
 }
+
+fun <Key, Value> OneToManyAndroidRepo(
+    tableName: String,
+    keySerializer: KSerializer<Key>,
+    valueSerializer: KSerializer<Value>,
+    helper: SQLiteOpenHelper
+) = OneToManyAndroidRepo(
+    tableName,
+    { internalSerialFormat.encodeToString(keySerializer, this) },
+    { internalSerialFormat.encodeToString(valueSerializer, this) },
+    { internalSerialFormat.decodeFromString(keySerializer, this) },
+    { internalSerialFormat.decodeFromString(valueSerializer, this) },
+    helper
+)
+
+fun <Key, Value> KeyValuesAndroidRepo(
+    tableName: String,
+    keySerializer: KSerializer<Key>,
+    valueSerializer: KSerializer<Value>,
+    helper: SQLiteOpenHelper
+) = OneToManyAndroidRepo(tableName, keySerializer, valueSerializer, helper)