Replace get*Type*() methods by extension get operator

Author: shepeliev

firebase-remoteconfig/src/androidMain/kotlin/dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfig.kt

@@ -1,3 +1,4 @@
+@file:JvmName("android")
 package dev.gitlive.firebase.remoteconfig
 
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigClientException
@@ -48,12 +49,8 @@ actual class FirebaseRemoteConfig internal constructor(val android: AndroidFireb
     actual suspend fun activate(): Boolean = android.activate().await()
     actual suspend fun ensureInitialized() = android.ensureInitialized().await().let { }
     actual suspend fun fetchAndActivate(): Boolean = android.fetchAndActivate().await()
-    actual fun getBoolean(key: String) = android.getBoolean(key)
-    actual fun getDouble(key: String) = android.getDouble(key)
     actual fun getKeysByPrefix(prefix: String): Set<String> = android.getKeysByPrefix(prefix)
-    actual fun getLong(key: String) = android.getLong(key)
-    actual fun getString(key: String) = android.getString(key)
-    actual operator fun get(key: String) = FirebaseRemoteConfigValue(android.getValue(key))
+    actual fun getValue(key: String) = FirebaseRemoteConfigValue(android.getValue(key))
     actual suspend fun reset() = android.reset().await().let { }
 
     private fun AndroidFirebaseRemoteConfigSettings.asCommon(): FirebaseRemoteConfigSettings {

firebase-remoteconfig/src/commonMain/kotlin/dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfig.kt

@@ -16,17 +16,25 @@ expect class FirebaseRemoteConfig {
     suspend fun ensureInitialized()
     suspend fun fetch(minimumFetchIntervalInSeconds: Long? = null)
     suspend fun fetchAndActivate(): Boolean
-    fun getBoolean(key: String): Boolean
-    fun getDouble(key: String): Double
     fun getKeysByPrefix(prefix: String): Set<String>
-    fun getLong(key: String): Long
-    fun getString(key: String): String
-    operator fun get(key: String): FirebaseRemoteConfigValue
+    fun getValue(key: String): FirebaseRemoteConfigValue
     suspend fun reset()
     suspend fun settings(init: FirebaseRemoteConfigSettings.() -> Unit)
     suspend fun setDefaults(vararg defaults: Pair<String, Any?>)
 }
 
+inline operator fun <reified T> FirebaseRemoteConfig.get(key: String): T {
+    val configValue = getValue(key)
+    return when(T::class) {
+        Boolean::class -> configValue.asBoolean() as T
+        Double::class -> configValue.asDouble() as T
+        Long::class -> configValue.asLong() as T
+        String::class -> configValue.asString() as T
+        FirebaseRemoteConfigValue::class -> configValue as T
+        else -> throw IllegalArgumentException()
+    }
+}
+
 expect open class FirebaseRemoteConfigException : FirebaseException
 expect class FirebaseRemoteConfigClientException : FirebaseRemoteConfigException
 expect class FirebaseRemoteConfigFetchThrottledException : FirebaseRemoteConfigException

firebase-remoteconfig/src/commonTest/kotlin/dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfig.kt

@@ -54,13 +54,13 @@ class FirebaseRemoteConfigTest {
         val remoteConfig = Firebase.remoteConfig
         remoteConfig.setDefaults(*defaults)
 
-        assertEquals(true, remoteConfig.getBoolean("test_default_boolean"))
-        assertEquals(42.0, remoteConfig.getDouble("test_default_double"))
-        assertEquals(42L, remoteConfig.getLong("test_default_long"))
-        assertEquals("Hello World", remoteConfig.getString("test_default_string"))
-        assertEquals("Hello World", remoteConfig.getString("test_default_string"))
+        assertEquals(true, remoteConfig["test_default_boolean"])
+        assertEquals(42.0, remoteConfig["test_default_double"])
+        assertEquals(42L, remoteConfig["test_default_long"])
+        assertEquals("Hello World", remoteConfig["test_default_string"])
+        assertEquals("Hello World", remoteConfig["test_default_string"])
 
-        val value = remoteConfig["test_default_string"]
+        val value: FirebaseRemoteConfigValue = remoteConfig["test_default_string"]
         assertEquals("Hello World", value.asString())
         assertEquals(ValueSource.Default, value.getSource())
         assertEquals("Hello World", value.asByteArray().decodeToString())
@@ -129,7 +129,7 @@ class FirebaseRemoteConfigTest {
         remoteConfig.fetch()
         remoteConfig.activate()
 
-        val value = remoteConfig["test_remote_string"]
+        val value: FirebaseRemoteConfigValue = remoteConfig["test_remote_string"]
         assertEquals("Hello from remote!", value.asString())
         assertEquals(ValueSource.Remote, value.getSource())
     }
@@ -144,7 +144,7 @@ class FirebaseRemoteConfigTest {
 
         remoteConfig.fetchAndActivate()
 
-        val value = remoteConfig["test_remote_string"]
+        val value: FirebaseRemoteConfigValue = remoteConfig["test_remote_string"]
         assertEquals("Hello from remote!", value.asString())
         assertEquals(ValueSource.Remote, value.getSource())
     }

firebase-remoteconfig/src/iosMain/kotlin/dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfig.kt

@@ -70,15 +70,10 @@ actual class FirebaseRemoteConfig internal constructor(val ios: FIRRemoteConfig)
         return status == FIRRemoteConfigFetchAndActivateStatus.FIRRemoteConfigFetchAndActivateStatusSuccessFetchedFromRemote
     }
 
-    actual fun getBoolean(key: String): Boolean = ios.configValueForKey(key).boolValue
-    actual fun getDouble(key: String): Double = ios.configValueForKey(key).numberValue.doubleValue
-    actual fun getLong(key: String): Long = ios.configValueForKey(key).numberValue.longValue
-    actual fun getString(key: String): String = ios.configValueForKey(key).stringValue ?: ""
-
     actual fun getKeysByPrefix(prefix: String): Set<String> =
         all.keys.filter { it.startsWith(prefix) }.toSet()
 
-    actual operator fun get(key: String): FirebaseRemoteConfigValue =
+    actual fun getValue(key: String): FirebaseRemoteConfigValue =
         FirebaseRemoteConfigValue(ios.configValueForKey(key))
 
     actual suspend fun reset() {

firebase-remoteconfig/src/jsMain/kotlin/dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfig.kt

@@ -20,7 +20,7 @@ actual fun Firebase.remoteConfig(app: FirebaseApp): FirebaseRemoteConfig = rethr
 
 actual class FirebaseRemoteConfig internal constructor(val js: firebase.remoteConfig.RemoteConfig) {
     actual val all: Map<String, FirebaseRemoteConfigValue>
-        get() = rethrow { getAllKeys().map { Pair(it, this[it]) }.toMap() }
+        get() = rethrow { getAllKeys().map { Pair(it, getValue(it)) }.toMap() }
 
     actual val info: FirebaseRemoteConfigInfo
         get() = rethrow {
@@ -38,12 +38,8 @@ actual class FirebaseRemoteConfig internal constructor(val js: firebase.remoteCo
         rethrow { js.fetch().await() }
 
     actual suspend fun fetchAndActivate(): Boolean = rethrow { js.fetchAndActivate().await() }
-    actual fun getBoolean(key: String): Boolean = rethrow { js.getBoolean(key) }
-    actual fun getDouble(key: String): Double = rethrow { js.getNumber(key).toDouble() }
-    actual fun getLong(key: String): Long = rethrow { js.getNumber(key).toLong() }
-    actual fun getString(key: String): String = rethrow { js.getString(key) ?: "" }
 
-    actual operator fun get(key: String): FirebaseRemoteConfigValue = rethrow {
+    actual fun getValue(key: String): FirebaseRemoteConfigValue = rethrow {
         FirebaseRemoteConfigValue(js.getValue(key))
     }