Stop double quoting JSON values (#57)

Author: kevincianfarini

gradle.properties

@@ -2,7 +2,7 @@ kotlin.code.style=official
 kotlin.jvm.target=11
 
 GROUP=io.github.kevincianfarini.monarch
-VERSION_NAME=0.2.0
+VERSION_NAME=0.2.1
 
 POM_INCEPTION_YEAR=2024
 

gradle/libs.versions.toml

@@ -8,7 +8,7 @@ kotlin = "1.9.22"
 kotlin-nodejs = "18.16.12-pre.634"
 kotlinx-coroutines = "1.8.0"
 kotlinx-serialization = "1.6.2"
-launchdarkly-android = "5.0.0"
+launchdarkly-android = "5.0.5"
 publish = "0.27.0"
 turbine = "1.0.0"
 

integrations/launch-darkly/build.gradle.kts

@@ -2,7 +2,6 @@ plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.dokka)
     alias(libs.plugins.kotlin.multiplatform)
-    alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.publish)
 }
 
@@ -35,7 +34,6 @@ kotlin {
         commonTest.dependencies {
             implementation(libs.kotlin.test)
             implementation(libs.kotlinx.coroutines.test)
-            implementation(libs.kotlinx.serialization.json)
             implementation(libs.turbine)
         }
         androidMain.dependencies {

integrations/launch-darkly/src/androidMain/kotlin/io/github/kevincianfarini/monarch/launchdarkly/LaunchDarklyFeatureFlagDataStore.kt

@@ -1,6 +1,5 @@
 package io.github.kevincianfarini.monarch.launchdarkly
 
-import com.launchdarkly.sdk.LDValue
 import com.launchdarkly.sdk.android.LDClientInterface
 import io.github.kevincianfarini.monarch.ObservableFeatureFlagDataStore
 import kotlinx.coroutines.channels.awaitClose
@@ -56,13 +55,7 @@ private inline fun <reified T : Any> LDClientInterface.observeValue(key: String,
 private inline fun <reified T : Any> LDClientInterface.getValue(key: String, default: T): T {
     return when (val clazz = T::class) {
         Boolean::class -> boolVariation(key, default as Boolean) as T
-        String::class -> {
-            val ldValue = jsonValueVariation(key, LDValue.ofNull())
-            when (ldValue.isNull) {
-                true -> stringVariation(key, default as String)
-                false -> ldValue.toJsonString()
-            } as T
-        }
+        String::class -> stringVariation(key, default as String)  as T
         Double::class -> doubleVariation(key, default as Double) as T
         Long::class -> intVariation(key, (default as Long).toInt()).toLong() as T
         else -> throw IllegalArgumentException("Illegal type for getValue: $clazz")

integrations/launch-darkly/src/androidUnitTest/kotlin/io/github/kevincianfarini/monarch/launchdarkly/LaunchDarklyFeatureFlagDataStoreTest.android.kt

@@ -9,8 +9,6 @@ import com.launchdarkly.sdk.android.LDAllFlagsListener
 import com.launchdarkly.sdk.android.LDClientInterface
 import com.launchdarkly.sdk.android.LDStatusListener
 import io.github.kevincianfarini.monarch.ObservableFeatureFlagDataStore
-import kotlinx.serialization.SerializationStrategy
-import kotlinx.serialization.json.Json
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.Future
 
@@ -74,11 +72,6 @@ private class FakeLDClient : LDClientInterface, MutableLDClientInterface {
         listeners[flagKey]?.forEach { it.onFeatureFlagChange(flagKey) }
     }
 
-    override fun <T> setVariation(flagKey: String, value: T, serialzer: SerializationStrategy<T>) {
-        flagValues[flagKey] = LDValue.parse(Json.Default.encodeToString(serialzer, value))
-        listeners[flagKey]?.forEach { it.onFeatureFlagChange(flagKey) }
-    }
-
     override fun boolVariationDetail(p0: String?, p1: Boolean): EvaluationDetail<Boolean> {
         TODO("Not yet implemented")
     }

integrations/launch-darkly/src/commonTest/kotlin/io/github/kevincianfarini/monarch/launchdarkly/LaunchDarklyFeatureFlagDataStoreTest.kt

@@ -3,8 +3,6 @@ package io.github.kevincianfarini.monarch.launchdarkly
 import app.cash.turbine.test
 import io.github.kevincianfarini.monarch.ObservableFeatureFlagDataStore
 import kotlinx.coroutines.test.runTest
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.Json
 import kotlin.test.*
 
 class LaunchDarklyFeatureFlagDataStoreTest {
@@ -53,14 +51,6 @@ class LaunchDarklyFeatureFlagDataStoreTest {
         assertEquals("non_default", dataStore.getString("key", "default"))
     }
 
-    @Test fun getting_string_from_json_flag_returns_value() {
-        val (dataStore, mutate) = sut()
-        val expected = Thing(1, 2)
-        mutate.setVariation("key", expected, Thing.serializer())
-        val jsonString = dataStore.getString("key", "{}")
-        assertEquals(expected, Json.Default.decodeFromString(Thing.serializer(), jsonString))
-    }
-
     @Test fun observing_string_coerces_initial_default_to_null() = runTest {
         val (dataStore, _) = sut()
         dataStore.observeString("key", "default").test {
@@ -156,22 +146,6 @@ class LaunchDarklyFeatureFlagDataStoreTest {
             assertEquals(3L, awaitItem())
         }
     }
-
-    @Test fun observing_json_string_emits_value_updates() = runTest {
-        val (dataStore, mutate) = sut()
-        val first = Thing(1, 2)
-        val second = Thing(2, 3)
-        mutate.setVariation("key", first, Thing.serializer())
-        dataStore.observeString("key", "{}").test {
-            val item = awaitItem()
-            assertEquals(first, Json.Default.decodeFromString(Thing.serializer(), item))
-            mutate.setVariation("key", second, Thing.serializer())
-            assertEquals(second, Json.Default.decodeFromString(Thing.serializer(), awaitItem()))
-        }
-    }
 }
 
-@Serializable
-private data class Thing(val first: Int, val second: Int)
-
 expect fun sut(): Pair<ObservableFeatureFlagDataStore, MutableLDClientInterface>

integrations/launch-darkly/src/commonTest/kotlin/io/github/kevincianfarini/monarch/launchdarkly/MutableLDClientInterface.kt

@@ -1,13 +1,9 @@
 package io.github.kevincianfarini.monarch.launchdarkly
 
-import kotlinx.serialization.SerializationStrategy
-
 interface MutableLDClientInterface {
-
     fun setVariation(flagKey: String, value: Boolean)
     fun setVariation(flagKey: String, value: String)
     fun setVariation(flagKey: String, value: Double)
     fun setVariation(flagKey: String, value: Int)
-    fun <T> setVariation(flagKey: String, value: T, serialzer: SerializationStrategy<T>)
 }
 

integrations/launch-darkly/src/iosMain/kotlin/io/github/kevincianfarini/monarch/launchdarkly/LaunchDarklyClientShim.kt

@@ -28,11 +28,6 @@ public interface LaunchDarklyClientShim {
      */
     public fun stringVariation(forKey: String, default: String): String
 
-    /**
-     * Return a JSON encoded [String] value [forKey], or [default] if no value exists.
-     */
-    public fun jsonStringVariation(forKey: String, default: String?): String?
-
     /**
      * Register a [handler] to be invoked when the value associated with [key] changes, scoped
      * to [owner].

integrations/launch-darkly/src/iosMain/kotlin/io/github/kevincianfarini/monarch/launchdarkly/LaunchDarklyFeatureFlagDataStore.kt

@@ -68,13 +68,7 @@ private inline fun <reified T : Any> LaunchDarklyClientShim.observeValue(key: St
 private inline fun <reified T : Any> LaunchDarklyClientShim.getValue(key: String, default: T): T {
     return when (val clazz = T::class) {
         Boolean::class -> boolVariation(key, default as Boolean) as T
-        String::class -> {
-            val jsonString = jsonStringVariation(key, null)
-            when (jsonString) {
-                null -> stringVariation(key, default as String)
-                else -> jsonString
-            } as T
-        }
+        String::class -> stringVariation(key, default as String) as T
         Double::class -> doubleVariation(key, default as Double) as T
         Long::class -> intVariation(key, (default as Long).toInt()).toLong() as T
         else -> throw IllegalArgumentException("Illegal type for getValue: $clazz")

integrations/launch-darkly/src/iosTest/kotlin/io/github/kevincianfarini/monarch/launchdarkly/LaunchDarklyFeatureFlagDataStoreTest.ios.kt

@@ -1,8 +1,6 @@
 package io.github.kevincianfarini.monarch.launchdarkly
 
 import io.github.kevincianfarini.monarch.ObservableFeatureFlagDataStore
-import kotlinx.serialization.SerializationStrategy
-import kotlinx.serialization.json.Json
 
 actual fun sut(): Pair<ObservableFeatureFlagDataStore, MutableLDClientInterface> {
     val client = FakeLDShim()
@@ -34,11 +32,6 @@ private class FakeLDShim : LaunchDarklyClientShim, MutableLDClientInterface {
         listeners.filter { it.key == flagKey }.forEach { it.handler() }
     }
 
-    override fun <T> setVariation(flagKey: String, value: T, serialzer: SerializationStrategy<T>) {
-        flagValues[flagKey] = JsonValue(Json.Default.encodeToString(serialzer, value))
-        listeners.filter { it.key == flagKey }.forEach { it.handler() }
-    }
-
     override fun boolVariation(forKey: String, default: Boolean): Boolean {
         return (flagValues[forKey] as? Boolean) ?: default
     }
@@ -55,10 +48,6 @@ private class FakeLDShim : LaunchDarklyClientShim, MutableLDClientInterface {
         return (flagValues[forKey] as? String) ?: default
     }
 
-    override fun jsonStringVariation(forKey: String, default: String?): String? {
-        return (flagValues[forKey] as? JsonValue)?.jsonString ?: default
-    }
-
     override fun observe(key: String, owner: ObserverOwner, handler: () -> Unit) {
         listeners.add(FlagListener(key, owner, handler))
     }
@@ -73,5 +62,3 @@ private data class FlagListener(
     val owner: ObserverOwner,
     val handler: () -> Unit,
 )
-
-private class JsonValue(val jsonString: String)