Use defaultRequest plugin

badoo · Dec 6, 2024 · ccc9afd · ccc9afd
1 parent 17c5de2
commit ccc9afd
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/core/src/main/kotlin/com/malinskiy/marathon/cache/gradle/GradleHttpCacheService.kt b/core/src/main/kotlin/com/malinskiy/marathon/cache/gradle/GradleHttpCacheService.kt
@@ -11,18 +11,19 @@ import io.ktor.client.engine.apache.Apache
 import io.ktor.client.plugins.auth.Auth
 import io.ktor.client.plugins.auth.providers.BasicAuthCredentials
 import io.ktor.client.plugins.auth.providers.basic
+import io.ktor.client.plugins.defaultRequest
 import io.ktor.client.request.get
 import io.ktor.client.request.put
 import io.ktor.client.request.setBody
 import io.ktor.client.statement.bodyAsChannel
 import io.ktor.content.ByteArrayContent
 import io.ktor.http.HttpStatusCode
 import io.ktor.http.isSuccess
+import io.ktor.http.takeFrom
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.io.ByteArrayOutputStream
 import java.io.IOException
-import java.net.URL
 
 class GradleHttpCacheService(private val configuration: RemoteCacheConfiguration.Enabled) : CacheService {
 
@@ -33,7 +34,7 @@ class GradleHttpCacheService(private val configuration: RemoteCacheConfiguration
     override suspend fun load(key: CacheKey, reader: CacheEntryReader): Boolean =
         withContext(Dispatchers.IO) {
             try {
-                val response = httpClient.get(url = key.entryUrl())
+                val response = httpClient.get(key.key)
                 if (response.status != HttpStatusCode.OK) {
                     if (response.status != HttpStatusCode.NotFound) {
                         logger.warn("Got response status when loading cache entry for ${key.key} : ${response.status}")
@@ -54,9 +55,11 @@ class GradleHttpCacheService(private val configuration: RemoteCacheConfiguration
             val stream = ByteArrayOutputStream()
             try {
                 writer.writeTo(stream)
-                val response = httpClient.put(url = key.entryUrl()) { setBody(ByteArrayContent(stream.toByteArray())) }
+                val response = httpClient.put(key.key) {
+                    setBody(ByteArrayContent(stream.toByteArray()))
+                }
                 if (!response.status.isSuccess()) {
-                    logger.warn("Got response status when storing cache entry for ${key.key} with ${key.entryUrl()} : ${response.status}")
+                    logger.warn("Got response status when storing cache entry for ${key.key} : ${response.status}")
                 }
             } catch (exception: IOException) {
                 logger.warn("Error during storing cache entry for ${key.key}", exception)
@@ -70,10 +73,11 @@ class GradleHttpCacheService(private val configuration: RemoteCacheConfiguration
         httpClient.close()
     }
 
-    private fun CacheKey.entryUrl(): URL =
-        configuration.url.resolve(key).toURL()
-
     private fun createClient(): HttpClient = HttpClient(Apache) {
+        defaultRequest {
+            url.takeFrom(configuration.url)
+        }
+
         engine {
             followRedirects = true
         }