Revert "Callback to receive raw response body from featurevisor data …

…request" (#29)
featurevisor · Apr 5, 2024 · 077655b · 077655b
1 parent 6e851dd
commit 077655b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 12 deletions.
diff --git a/src/main/kotlin/com/featurevisor/sdk/Instance+Fetch.kt b/src/main/kotlin/com/featurevisor/sdk/Instance+Fetch.kt
@@ -13,20 +13,18 @@ import java.lang.IllegalArgumentException
 internal fun FeaturevisorInstance.fetchDatafileContent(
     url: String,
     handleDatafileFetch: DatafileFetchHandler? = null,
-    rawResponseReady: (ResponseBody) -> Unit,
     completion: (Result<DatafileContent>) -> Unit,
 ) {
     handleDatafileFetch?.let { handleFetch ->
         val result = handleFetch(url)
         completion(result)
     } ?: run {
-        fetchDatafileContentFromUrl(url, rawResponseReady, completion)
+        fetchDatafileContentFromUrl(url, completion)
     }
 }
 
 private fun fetchDatafileContentFromUrl(
     url: String,
-    rawResponseReady: (ResponseBody) -> Unit,
     completion: (Result<DatafileContent>) -> Unit,
 ) {
     try {
@@ -36,7 +34,7 @@ private fun fetchDatafileContentFromUrl(
             .addHeader("Content-Type", "application/json")
             .build()
 
-        fetch(request, rawResponseReady, completion)
+        fetch(request, completion)
     } catch (throwable: IllegalArgumentException) {
         completion(Result.failure(FeaturevisorError.InvalidUrl(url)))
     }
@@ -45,15 +43,13 @@ private fun fetchDatafileContentFromUrl(
 const val BODY_BYTE_COUNT = 1000000L
 private inline fun fetch(
     request: Request,
-    crossinline rawResponseReady: (ResponseBody) -> Unit,
     crossinline completion: (Result<DatafileContent>) -> Unit,
 ) {
     val client = OkHttpClient()
     val call = client.newCall(request)
     call.enqueue(object : Callback {
         override fun onResponse(call: Call, response: Response) {
             val responseBody = response.peekBody(BODY_BYTE_COUNT)
-            rawResponseReady(responseBody)
             if (response.isSuccessful) {
                 val json = Json {
                     ignoreUnknownKeys = true

diff --git a/src/main/kotlin/com/featurevisor/sdk/Instance+Refresh.kt b/src/main/kotlin/com/featurevisor/sdk/Instance+Refresh.kt
@@ -42,7 +42,6 @@ private fun FeaturevisorInstance.refresh() {
             fetchDatafileContent(
                 datafileUrl,
                 handleDatafileFetch,
-                rawResponseReady,
             ) { result ->
 
                 if (result.isSuccess) {

diff --git a/src/main/kotlin/com/featurevisor/sdk/Instance.kt b/src/main/kotlin/com/featurevisor/sdk/Instance.kt
@@ -9,7 +9,6 @@ import com.featurevisor.types.EventName.*
 import kotlinx.coroutines.Job
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
-import okhttp3.ResponseBody
 
 typealias ConfigureBucketKey = (Feature, Context, BucketKey) -> BucketKey
 typealias ConfigureBucketValue = (Feature, Context, BucketValue) -> BucketValue
@@ -57,7 +56,6 @@ class FeaturevisorInstance private constructor(options: InstanceOptions) {
     internal var configureBucketKey = options.configureBucketKey
     internal var configureBucketValue = options.configureBucketValue
     internal var refreshJob: Job? = null
-    internal var rawResponseReady: (ResponseBody) -> Unit = options.rawResponseReady
 
     init {
         with(options) {
@@ -102,7 +100,7 @@ class FeaturevisorInstance private constructor(options: InstanceOptions) {
 
                 datafileUrl != null -> {
                     datafileReader = DatafileReader(options.datafile?: emptyDatafile)
-                    fetchDatafileContent(datafileUrl, handleDatafileFetch, rawResponseReady) { result ->
+                    fetchDatafileContent(datafileUrl, handleDatafileFetch) { result ->
                         if (result.isSuccess) {
                             datafileReader = DatafileReader(result.getOrThrow())
                             statuses.ready = true

diff --git a/src/main/kotlin/com/featurevisor/sdk/InstanceOptions.kt b/src/main/kotlin/com/featurevisor/sdk/InstanceOptions.kt
@@ -3,7 +3,6 @@ package com.featurevisor.sdk
 import com.featurevisor.types.DatafileContent
 import com.featurevisor.types.InitialFeatures
 import com.featurevisor.types.StickyFeatures
-import okhttp3.ResponseBody
 
 typealias Listener = (Array<out Any>) -> Unit
 
@@ -24,7 +23,6 @@ data class InstanceOptions(
     val onError: Listener? = null,
     val refreshInterval: Long? = null, // seconds
     val stickyFeatures: StickyFeatures? = null,
-    val rawResponseReady: (ResponseBody) -> Unit = {},
 ) {
     companion object {
         private const val defaultBucketKeySeparator = "."