From ddb8e1efb458b2e3d6953387bd9d307ae5f9d57d Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 3 Mar 2025 12:15:36 +0600 Subject: [PATCH] fix build --- .../inmo/micro_utils/repos/cache/KeyValueCacheRepo.kt | 2 +- .../cache/fallback/keyvalue/AutoRecacheKeyValueRepo.kt | 10 +++++----- .../fallback/keyvalues/AutoRecacheKeyValueRepo.kt | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/repos/cache/src/commonMain/kotlin/dev/inmo/micro_utils/repos/cache/KeyValueCacheRepo.kt b/repos/cache/src/commonMain/kotlin/dev/inmo/micro_utils/repos/cache/KeyValueCacheRepo.kt index 48263b0d2f0..02148900f93 100644 --- a/repos/cache/src/commonMain/kotlin/dev/inmo/micro_utils/repos/cache/KeyValueCacheRepo.kt +++ b/repos/cache/src/commonMain/kotlin/dev/inmo/micro_utils/repos/cache/KeyValueCacheRepo.kt @@ -62,7 +62,7 @@ open class KeyValueCacheRepo( kvCache: KVCache, scope: CoroutineScope = CoroutineScope(Dispatchers.Default), locker: SmartRWLocker = SmartRWLocker(), -) : ReadKeyValueCacheRepo(kvRepo, kvCache, locker), KeyValueRepo, WriteKeyValueRepo by parentRepo, CommonCacheRepo { +) : ReadKeyValueCacheRepo(kvRepo, kvCache, locker), KeyValueRepo, WriteKeyValueRepo by kvRepo, CommonCacheRepo { protected val onNewJob = kvRepo.onNewValue.onEach { locker.withWriteLock { kvCache.set(it.first, it.second) diff --git a/repos/cache/src/commonMain/kotlin/dev/inmo/micro_utils/repos/cache/fallback/keyvalue/AutoRecacheKeyValueRepo.kt b/repos/cache/src/commonMain/kotlin/dev/inmo/micro_utils/repos/cache/fallback/keyvalue/AutoRecacheKeyValueRepo.kt index be3ca90e7c4..db7f2a3255a 100644 --- a/repos/cache/src/commonMain/kotlin/dev/inmo/micro_utils/repos/cache/fallback/keyvalue/AutoRecacheKeyValueRepo.kt +++ b/repos/cache/src/commonMain/kotlin/dev/inmo/micro_utils/repos/cache/fallback/keyvalue/AutoRecacheKeyValueRepo.kt @@ -8,21 +8,21 @@ import kotlinx.coroutines.CoroutineScope import kotlin.time.Duration.Companion.seconds open class AutoRecacheKeyValueRepo( - override val originalRepo: KeyValueRepo, + protected val kvRepo: KeyValueRepo, scope: CoroutineScope, kvCache: KeyValueRepo = MapKeyValueRepo(), recacheDelay: Long = 60.seconds.inWholeMilliseconds, actionWrapper: ActionWrapper = ActionWrapper.Direct, idGetter: (RegisteredObject) -> Id ) : AutoRecacheReadKeyValueRepo ( - originalRepo, + kvRepo, scope, kvCache, recacheDelay, actionWrapper, idGetter ), - WriteKeyValueRepo by AutoRecacheWriteKeyValueRepo(originalRepo, scope, kvCache), + WriteKeyValueRepo by AutoRecacheWriteKeyValueRepo(kvRepo, scope, kvCache), KeyValueRepo { constructor( @@ -34,14 +34,14 @@ open class AutoRecacheKeyValueRepo( idGetter: (RegisteredObject) -> Id ) : this(originalRepo, scope, kvCache, recacheDelay, ActionWrapper.Timeouted(originalCallTimeoutMillis), idGetter) - override suspend fun unsetWithValues(toUnset: List) = originalRepo.unsetWithValues( + override suspend fun unsetWithValues(toUnset: List) = kvRepo.unsetWithValues( toUnset ).also { kvCache.unsetWithValues(toUnset) } override suspend fun clear() { - originalRepo.clear() + kvRepo.clear() kvCache.clear() } } diff --git a/repos/cache/src/commonMain/kotlin/dev/inmo/micro_utils/repos/cache/fallback/keyvalues/AutoRecacheKeyValueRepo.kt b/repos/cache/src/commonMain/kotlin/dev/inmo/micro_utils/repos/cache/fallback/keyvalues/AutoRecacheKeyValueRepo.kt index c6ece8797ea..db1fe7b6912 100644 --- a/repos/cache/src/commonMain/kotlin/dev/inmo/micro_utils/repos/cache/fallback/keyvalues/AutoRecacheKeyValueRepo.kt +++ b/repos/cache/src/commonMain/kotlin/dev/inmo/micro_utils/repos/cache/fallback/keyvalues/AutoRecacheKeyValueRepo.kt @@ -9,19 +9,19 @@ import kotlinx.coroutines.CoroutineScope import kotlin.time.Duration.Companion.seconds open class AutoRecacheKeyValuesRepo( - override val originalRepo: KeyValuesRepo, + protected val kvsRepo: KeyValuesRepo, scope: CoroutineScope, kvCache: KeyValueRepo> = MapKeyValueRepo(), recacheDelay: Long = 60.seconds.inWholeMilliseconds, actionWrapper: ActionWrapper = ActionWrapper.Direct ) : AutoRecacheReadKeyValuesRepo ( - originalRepo, + kvsRepo, scope, kvCache, recacheDelay, actionWrapper ), - WriteKeyValuesRepo by AutoRecacheWriteKeyValuesRepo(originalRepo, scope, kvCache), + WriteKeyValuesRepo by AutoRecacheWriteKeyValuesRepo(kvsRepo, scope, kvCache), KeyValuesRepo { constructor(