use proper types rather than json types

Author: prayansh

core/src/main/java/com/segment/analytics/kotlin/core/Events.kt

@@ -35,9 +35,9 @@ class DateSerializer : KSerializer<Instant> {
 
 @Serializable
 data class DestinationMetadata(
-    var bundled: JsonArray = emptyJsonArray,
-    var unbundled: JsonArray = emptyJsonArray,
-    var bundledIds: JsonArray = emptyJsonArray,
+    var bundled: List<String>? = emptyList(),
+    var unbundled: List<String>? = emptyList(),
+    var bundledIds: List<String>? = emptyList(),
 )
 
 @Serializable

core/src/main/java/com/segment/analytics/kotlin/core/HTTPClient.kt

@@ -11,7 +11,6 @@ import java.net.HttpURLConnection
 import java.net.MalformedURLException
 import java.net.URL
 import java.util.zip.GZIPOutputStream
-
 class HTTPClient(private val writeKey: String) {
     internal val authHeader = authorizationHeader(writeKey)
 
@@ -30,7 +29,6 @@ class HTTPClient(private val writeKey: String) {
     fun upload(apiHost: String): Connection {
         val connection: HttpURLConnection = openConnection("https://$apiHost/b")
         connection.setRequestProperty("Content-Type", "text/plain")
-        connection.setRequestProperty("Content-Encoding", "gzip")
         connection.setRequestProperty("Authorization", authHeader)
         connection.doOutput = true
         connection.setChunkedStreamingMode(0)
@@ -99,6 +97,7 @@ internal fun HttpURLConnection.createGetConnection(): Connection {
 
 internal fun HttpURLConnection.createPostConnection(): Connection {
     val outputStream: OutputStream
+    setRequestProperty("Content-Encoding", "gzip")
     outputStream = GZIPOutputStream(this.outputStream)
     return object : Connection(this, null, outputStream) {
         @Throws(IOException::class)
@@ -138,4 +137,16 @@ internal class HTTPException(
     fun is4xx(): Boolean {
         return responseCode in 400..499
     }
-}
+}
+/*
+
+curl -H "Authorization:Basic: 2Iv5ifBwYxcTWwYPsfIwrzY9bKRtabKi" -H "Content-Type:application/json" \
+-d '{"type":"identify","userId":"bob","traits":{"email":"[email protected]"},"timestamp":"2022-01-06T12:34:56.789Z"}' \
+https://api.segment.build/v1/i
+
+
+curl -H "Authorization:Basic: 2Iv5ifBwYxcTWwYPsfIwrzY9bKRtabKi" -H "Content-Encoding:gzip" -H "Content-Type:application/json" \
+--data-binary @<(echo '{"type":"identify","userId":"bob","traits":{"email":"[email protected]"},"timestamp":"2022-01-06T12:34:56.789Z"}' | gzip) \
+https://api.segment.build/v1/i
+
+*/

core/src/main/java/com/segment/analytics/kotlin/core/platform/plugins/DestinationMetadataPlugin.kt

@@ -8,9 +8,7 @@ import com.segment.analytics.kotlin.core.platform.DestinationPlugin
 import com.segment.analytics.kotlin.core.platform.Plugin
 import com.segment.analytics.kotlin.core.utilities.safeJsonArray
 import com.segment.analytics.kotlin.core.utilities.safeJsonObject
-import kotlinx.serialization.json.JsonArray
-import kotlinx.serialization.json.add
-import kotlinx.serialization.json.buildJsonArray
+import kotlinx.serialization.json.JsonPrimitive
 
 /**
  * DestinationMetadataPlugin adds `_metadata` information to payloads that Segment uses to
@@ -33,24 +31,15 @@ class DestinationMetadataPlugin : Plugin {
             ?.filter { it.enabled && it !is SegmentDestination }
         val metadata = DestinationMetadata().apply {
             // Mark all loaded destinations as bundled
-            this.bundled = buildJsonArray {
-                enabledDestinations?.forEach {
-                    add(it.key)
-                }
-            }
+            this.bundled = enabledDestinations?.map { it.key }
+
             // All unbundledIntegrations not in `bundled` are put in `unbundled`
-            this.unbundled = buildJsonArray {
-                analyticsSettings.integrations["Segment.io"]?.safeJsonObject
-                    ?.get("unbundledIntegrations")?.safeJsonArray?.let { unbundledList ->
-                        unbundledList.forEach {
-                            if (!bundled.contains(it)) {
-                                add(it)
-                            }
-                        }
-                    }
-            }
+            this.unbundled = analyticsSettings.integrations["Segment.io"]?.safeJsonObject
+                ?.get("unbundledIntegrations")?.safeJsonArray?.map { (it as JsonPrimitive).content }
+                ?.filter { !(bundled?.contains(it) ?: false) }
+
             // `bundledIds` for mobile is empty
-            this.bundledIds = JsonArray(emptyList())
+            this.bundledIds = emptyList()
         }
 
         val payload = event.copy<BaseEvent>().apply {

core/src/test/kotlin/com/segment/analytics/kotlin/core/platform/plugins/DestinationMetadataPluginTests.kt

@@ -18,7 +18,6 @@ import io.mockk.mockkConstructor
 import io.mockk.mockkStatic
 import kotlinx.coroutines.test.TestCoroutineDispatcher
 import kotlinx.coroutines.test.TestCoroutineScope
-import kotlinx.serialization.json.JsonArray
 import kotlinx.serialization.json.add
 import kotlinx.serialization.json.buildJsonArray
 import kotlinx.serialization.json.buildJsonObject
@@ -104,14 +103,9 @@ class DestinationMetadataPluginTests {
 
         val expected = trackEvent.copy<TrackEvent>().apply {
             _metadata = DestinationMetadata(
-                unbundled = buildJsonArray {
-                    add("Customer.io")
-                    add("Amplitude")
-                },
-                bundled = buildJsonArray {
-                    add("Mixpanel")
-                },
-                bundledIds = JsonArray(emptyList())
+                unbundled = listOf("Customer.io","Amplitude"),
+                bundled = listOf("Mixpanel"),
+                bundledIds = emptyList()
             )
         }
         val actual = plugin.execute(trackEvent)