fixup! Update existing cache key usage to use OptionalHeaders

Author: Rodrigo Gomez Palacio

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/backend/impl/ParamsBackendService.kt

@@ -13,7 +13,7 @@ import com.onesignal.core.internal.backend.InfluenceParamsObject
 import com.onesignal.core.internal.backend.ParamsObject
 import com.onesignal.core.internal.http.CacheKeys
 import com.onesignal.core.internal.http.IHttpClient
-import com.onesignal.core.internal.http.impl.OptionalHeaderValues
+import com.onesignal.core.internal.http.impl.OptionalHeaders
 import com.onesignal.debug.LogLevel
 import com.onesignal.debug.internal.logging.Logging
 import org.json.JSONObject
@@ -32,9 +32,7 @@ internal class ParamsBackendService(
             paramsUrl += "?player_id=$subscriptionId"
         }
 
-        val headers = OptionalHeaderValues()
-        headers.cacheKey = CacheKeys.REMOTE_PARAMS
-        val response = _http.get(paramsUrl, headers)
+        val response = _http.get(paramsUrl, OptionalHeaders(cacheKey = CacheKeys.REMOTE_PARAMS))
 
         if (!response.isSuccess) {
             throw BackendException(response.statusCode, response.payload, response.retryAfterSeconds)

OneSignalSDK/onesignal/core/src/test/java/com/onesignal/core/internal/http/HttpClientTests.kt

@@ -3,7 +3,7 @@ package com.onesignal.core.internal.http
 import com.onesignal.common.OneSignalUtils
 import com.onesignal.core.internal.device.impl.InstallIdService
 import com.onesignal.core.internal.http.impl.HttpClient
-import com.onesignal.core.internal.http.impl.OptionalHeaderValues
+import com.onesignal.core.internal.http.impl.OptionalHeaders
 import com.onesignal.core.internal.time.impl.Time
 import com.onesignal.debug.LogLevel
 import com.onesignal.debug.internal.logging.Logging
@@ -89,11 +89,10 @@ class HttpClientTests : FunSpec({
         val httpClient = mocks.httpClient
 
         // When
-        val headerValues = OptionalHeaderValues()
-        headerValues.cacheKey = "CACHE_KEY"
-        val response1 = httpClient.get("URL", headerValues)
+        val headers = OptionalHeaders(cacheKey = "CACHE_KEY")
+        val response1 = httpClient.get("URL", headers)
         factory.mockResponse = mockResponse2
-        val response2 = httpClient.get("URL", headerValues)
+        val response2 = httpClient.get("URL", headers)
 
         // Then
         response1.statusCode shouldBe 200
@@ -126,15 +125,14 @@ class HttpClientTests : FunSpec({
         val httpClient = mocks.httpClient
 
         // When
-        val headerValues = OptionalHeaderValues()
-        headerValues.cacheKey = "CACHE_KEY"
-        val response1 = httpClient.get("URL", headerValues)
+        val headers = OptionalHeaders(cacheKey = "CACHE_KEY")
+        val response1 = httpClient.get("URL", headers)
 
         factory.mockResponse = mockResponse2
-        val response2 = httpClient.get("URL", headerValues)
+        val response2 = httpClient.get("URL", headers)
 
         factory.mockResponse = mockResponse3
-        val response3 = httpClient.get("URL", headerValues)
+        val response3 = httpClient.get("URL", headers)
 
         // Then
         response1.statusCode shouldBe 200