fix(model-server): IImmutableStore is supposed to return null values

modelix · Dec 12, 2024 · d17a384 · d17a384
1 parent 110b426
commit d17a384
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git a/model-server/src/main/kotlin/org/modelix/model/server/store/IImmutableStore.kt b/model-server/src/main/kotlin/org/modelix/model/server/store/IImmutableStore.kt
@@ -7,7 +7,7 @@ import org.modelix.model.IGenericKeyListener
  * Doesn't require transactions.
  */
 interface IImmutableStore<KeyT> {
-    fun getAll(keys: Set<KeyT>): Map<KeyT, String>
+    fun getAll(keys: Set<KeyT>): Map<KeyT, String?>
     fun addAll(entries: Map<KeyT, String>)
     fun getIfCached(key: KeyT): String?
 }

diff --git a/model-server/src/main/kotlin/org/modelix/model/server/store/IgniteStoreClient.kt b/model-server/src/main/kotlin/org/modelix/model/server/store/IgniteStoreClient.kt
@@ -248,13 +248,9 @@ class IgniteStoreClient(jdbcProperties: Properties? = null, private val inmemory
 
     override fun getImmutableStore(): IImmutableStore<ObjectInRepository> {
         return object : IImmutableStore<ObjectInRepository> {
-            override fun getAll(keys: Set<ObjectInRepository>): Map<ObjectInRepository, String> {
+            override fun getAll(keys: Set<ObjectInRepository>): Map<ObjectInRepository, String?> {
                 keys.forEach { require(HashUtil.isSha256(it.key)) { "Not an immutable object: $it" } }
-                return cache.getAll(keys).mapValues {
-                    val value = it.value
-                    if (value == null) throw ObjectValueNotFoundException(it.key.key)
-                    value
-                }
+                return cache.getAll(keys)
             }
 
             override fun addAll(entries: Map<ObjectInRepository, String>) {

diff --git a/model-server/src/main/kotlin/org/modelix/model/server/store/InMemoryStoreClient.kt b/model-server/src/main/kotlin/org/modelix/model/server/store/InMemoryStoreClient.kt
@@ -138,14 +138,10 @@ class InMemoryStoreClient : IsolatingStore, ITransactionManager, IRepositoryAwar
 
     override fun getImmutableStore(): IImmutableStore<ObjectInRepository> {
         return object : IImmutableStore<ObjectInRepository> {
-            override fun getAll(keys: Set<ObjectInRepository>): Map<ObjectInRepository, String> {
+            override fun getAll(keys: Set<ObjectInRepository>): Map<ObjectInRepository, String?> {
                 keys.forEach { require(HashUtil.isSha256(it.key)) { "Not an immutable object: $it" } }
                 @OptIn(RequiresTransaction::class)
-                return runRead { this@InMemoryStoreClient.getAll(keys) }.mapValues {
-                    val value = it.value
-                    if (value == null) throw ObjectValueNotFoundException(it.key.key)
-                    value
-                }
+                return runRead { this@InMemoryStoreClient.getAll(keys) }
             }
 
             override fun addAll(entries: Map<ObjectInRepository, String>) {

diff --git a/model-server/src/main/kotlin/org/modelix/model/server/store/StoreClientAdapter.kt b/model-server/src/main/kotlin/org/modelix/model/server/store/StoreClientAdapter.kt
@@ -90,7 +90,7 @@ abstract class StoreClientAdapter(val client: IsolatingStore) : IStoreClient {
     override fun getImmutableStore(): IImmutableStore<String> {
         val immutableStore = client.getImmutableStore()
         return object : IImmutableStore<String> {
-            override fun getAll(keys: Set<String>): Map<String, String> {
+            override fun getAll(keys: Set<String>): Map<String, String?> {
                 val fromRepository = immutableStore.getAll(keys.map { it.withRepoScope() }.toSet()).mapKeys { it.key.key }
                 if (getRepositoryId() == null) return fromRepository