Stop creating new http client for each request

stevesoltys · Sep 8, 2020 · 3b63eb2 · 3b63eb2
1 parent 809fcac
commit 3b63eb2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/src/main/kotlin/com/stevesoltys/applemusic/AppleMusic.kt b/src/main/kotlin/com/stevesoltys/applemusic/AppleMusic.kt
@@ -24,11 +24,15 @@ class AppleMusic(
         AppleMusicConfiguration(teamId, privateKey, keyId, storefront)
     }
 
+    private val retrofitBuilder: AppleMusicRetrofitBuilder by lazy {
+        AppleMusicRetrofitBuilder()
+    }
+
     private var currentToken: AppleMusicAuthToken? = null
 
     private val appleMusicService: AppleMusicService
         get() {
-            return AppleMusicRetrofitBuilder()
+            return retrofitBuilder
                 .build(configuration, token().toString())
                 .create(AppleMusicService::class.java)
         }

diff --git a/src/main/kotlin/com/stevesoltys/applemusic/net/AppleMusicRetrofitBuilder.kt b/src/main/kotlin/com/stevesoltys/applemusic/net/AppleMusicRetrofitBuilder.kt
@@ -11,18 +11,22 @@ import retrofit2.converter.jackson.JacksonConverterFactory
  */
 class AppleMusicRetrofitBuilder {
 
-    fun build(configuration: AppleMusicConfiguration, token: String): Retrofit {
-        val objectMapper = AppleMusicObjectMapper()
+    private val objectMapper = AppleMusicObjectMapper()
 
-        val okHttpClient = OkHttpClient.Builder()
-            .addInterceptor { chain ->
-                val newRequest: Request = chain.request().newBuilder()
-                    .addHeader("Authorization", "Bearer $token")
-                    .build()
+    private val okHttpClient = OkHttpClient.Builder()
+        .addInterceptor { chain ->
+            val newRequest: Request = chain.request().newBuilder()
+                .addHeader("Authorization", "Bearer $token")
+                .build()
 
-                chain.proceed(newRequest)
-            }
-            .build()
+            chain.proceed(newRequest)
+        }
+        .build()
+
+    private lateinit var token: String
+
+    fun build(configuration: AppleMusicConfiguration, token: String): Retrofit {
+        this.token = token
 
         return Retrofit.Builder()
             .baseUrl("https://api.music.apple.com/v1/catalog/${configuration.storefront}/")