Use map for instanced adapters

Author: clementetb

packages/library-base/src/commonMain/kotlin/io/realm/kotlin/Configuration.kt

@@ -239,7 +239,7 @@ public interface Configuration {
         protected var initialDataCallback: InitialDataCallback? = null
         protected var inMemory: Boolean = false
         protected var initialRealmFileConfiguration: InitialRealmFileConfiguration? = null
-        protected var typeAdapters: List<RealmTypeAdapter<*, *>> = listOf()
+        protected var typeAdapters: Map<KClass<*>, RealmTypeAdapter<*, *>> = mapOf()
 
         /**
          * Sets the filename of the realm file.

packages/library-base/src/commonMain/kotlin/io/realm/kotlin/RealmConfiguration.kt

@@ -92,9 +92,9 @@ public interface RealmConfiguration : Configuration {
 
         // TODO misplaced, move around
         public class TypeAdapterBuilder {
-            internal val adapters: MutableList<RealmTypeAdapter<*, *>> = mutableListOf()
+            internal val adapters: MutableMap<KClass<*>, RealmTypeAdapter<*, *>> = mutableMapOf()
             public fun add(adapter: RealmTypeAdapter<*,*>) {
-                adapters.add(adapter)
+                adapters[adapter::class] = adapter
             }
         }
 

packages/library-base/src/commonMain/kotlin/io/realm/kotlin/internal/ConfigurationImpl.kt

@@ -69,7 +69,7 @@ public open class ConfigurationImpl(
     inMemory: Boolean,
     initialRealmFileConfiguration: InitialRealmFileConfiguration?,
     logger: ContextLogger,
-    override val adapters: List<RealmTypeAdapter<*, *>>,
+    override val adapters: Map<KClass<*>, RealmTypeAdapter<*, *>>,
 ) : InternalConfiguration {
 
     override val path: String

packages/library-base/src/commonMain/kotlin/io/realm/kotlin/internal/Converters.kt

@@ -262,26 +262,30 @@ public inline fun longToInt(value: Long?): Int? = value?.toInt()
 
 public inline fun toRealm(
     obj: RealmObjectReference<out BaseRealmObject>,
-    converterClass: KClass<RealmTypeAdapter<Any, Any>>,
-    userValue: Any,
-): Any {
+    adapterClass: KClass<*>,
+    userValue: Any?,
+): Any? {
     val adapter = obj.owner.owner
         .configuration
-        .adapters
-        .first { it::class == converterClass } as RealmTypeAdapter<Any, Any>
+        .adapters.let { adapters ->
+            require(adapters.contains(adapterClass)) {"User provided adaptes don't contains adapter ${adapterClass.simpleName}"}
+            adapters[adapterClass] as RealmTypeAdapter<Any?, Any?>
+        }
 
     return adapter.toRealm(userValue)
 }
 
 public inline fun fromRealm(
     obj: RealmObjectReference<out BaseRealmObject>,
-    converterClass: KClass<RealmTypeAdapter<*, *>>,
+    adapterClass: KClass<*>,
     realmValue: Any,
-): Any {
+): Any? {
     val adapter = obj.owner.owner
         .configuration
-        .adapters
-        .first { it::class == converterClass } as RealmTypeAdapter<Any, Any>
+        .adapters.let { adapters ->
+            require(adapters.contains(adapterClass)) {"User provided adaptes don't contains adapter ${adapterClass.simpleName}"}
+            adapters[adapterClass] as RealmTypeAdapter<Any?, Any?>
+        }
 
     return adapter.fromRealm(realmValue)
 }

packages/library-base/src/commonMain/kotlin/io/realm/kotlin/internal/InternalConfiguration.kt

@@ -37,9 +37,7 @@ public interface InternalConfiguration : Configuration {
     public val writeDispatcherFactory: CoroutineDispatcherFactory
     public val schemaMode: SchemaMode
     public val logger: ContextLogger
-    // TODO make it a map
-//    public val adapters: Map<KClass<RealmTypeAdapter<*, *>>, RealmTypeAdapter<*, *>>
-    public val adapters: List<RealmTypeAdapter<*, *>>
+    public val adapters: Map<KClass<*>, RealmTypeAdapter<*, *>>
 
     // Temporary work-around for https://github.com/realm/realm-kotlin/issues/724
     public val isFlexibleSyncConfiguration: Boolean

packages/library-base/src/commonMain/kotlin/io/realm/kotlin/internal/RealmConfigurationImpl.kt

@@ -49,7 +49,7 @@ internal class RealmConfigurationImpl(
     inMemory: Boolean,
     override val initialRealmFileConfiguration: InitialRealmFileConfiguration?,
     logger: ContextLogger,
-    adapters: List<RealmTypeAdapter<*, *>>
+    adapters: Map<KClass<*>, RealmTypeAdapter<*, *>>
 ) : ConfigurationImpl(
     directory,
     name,