use cache limit

Author: adamint

README.md

@@ -51,7 +51,7 @@ dependencies {
 <dependency>
     <groupId>com.adamratzman</groupId>
     <artifactId>spotify-api-kotlin</artifactId>
-    <version>2.2.0</version>
+    <version>2.2.1</version>
 </dependency>
 
 <repository>

build.gradle

@@ -22,7 +22,7 @@ apply plugin: 'kotlin'
 apply plugin: 'org.jetbrains.dokka'
 
 group 'com.adamratzman'
-version '2.2.0'
+version '2.2.1'
 
 archivesBaseName = 'spotify-api-kotlin'
 

src/main/kotlin/com/adamratzman/spotify/Builder.kt

@@ -16,17 +16,17 @@ fun spotifyApi(block: SpotifyApiBuilderDsl.() -> Unit) = SpotifyApiBuilderDsl().
  * Spotify traditional Java style API builder
  */
 class SpotifyApiBuilder(
-    val clientId: String,
-    val clientSecret: String,
-    var redirectUri: String? = null,
-    var authorizationCode: String? = null,
-    var tokenString: String? = null,
-    var token: Token? = null,
-    var useCache: Boolean = true,
-    var cacheLimit: Int? = 1000,
-    var automaticRefresh: Boolean = true,
-    var retryWhenRateLimited: Boolean = false,
-    var enableLogger: Boolean = false
+        val clientId: String,
+        val clientSecret: String,
+        var redirectUri: String? = null,
+        var authorizationCode: String? = null,
+        var tokenString: String? = null,
+        var token: Token? = null,
+        var useCache: Boolean = true,
+        var cacheLimit: Int? = 1000,
+        var automaticRefresh: Boolean = true,
+        var retryWhenRateLimited: Boolean = false,
+        var enableLogger: Boolean = false
 ) {
     /**
      * Instantiate the builder with the application [clientId] and [clientSecret]
@@ -194,9 +194,9 @@ data class SpotifyCredentials(val clientId: String?, val clientSecret: String?,
  * limited time constraint on these before the API automatically refreshes them
  */
 class SpotifyUserAuthorizationBuilder(
-    var authorizationCode: String? = null,
-    var tokenString: String? = null,
-    var token: Token? = null
+        var authorizationCode: String? = null,
+        var tokenString: String? = null,
+        var token: Token? = null
 )
 
 /**
@@ -269,7 +269,7 @@ class SpotifyApiBuilderDsl {
         return when {
             authentication.token != null -> {
                 SpotifyAppAPI(clientId ?: "not-set", clientSecret
-                        ?: "not-set", authentication.token!!, useCache, false, retryWhenRateLimited, enableLogger)
+                        ?: "not-set", authentication.token!!, useCache, cacheLimit, false, retryWhenRateLimited, enableLogger)
             }
             authentication.tokenString != null -> {
                 SpotifyAppAPI(
@@ -280,6 +280,7 @@ class SpotifyApiBuilderDsl {
                                 60000, null, null
                         ),
                         useCache,
+                        cacheLimit,
                         automaticRefresh,
                         retryWhenRateLimited,
                         enableLogger
@@ -288,7 +289,7 @@ class SpotifyApiBuilderDsl {
             else -> try {
                 if (clientId == null || clientSecret == null) throw IllegalArgumentException("Illegal credentials provided")
                 val token = getCredentialedToken(clientId, clientSecret, null)
-                SpotifyAppAPI(clientId, clientSecret, token, useCache, automaticRefresh, retryWhenRateLimited, enableLogger)
+                SpotifyAppAPI(clientId, clientSecret, token, useCache, cacheLimit, automaticRefresh, retryWhenRateLimited, enableLogger)
             } catch (e: Exception) {
                 throw SpotifyException("Invalid credentials provided in the login process", e)
             }
@@ -325,9 +326,9 @@ class SpotifyApiBuilderDsl {
      * [authorizationCode] or [token] is provided
      */
     private fun buildClient(
-        authorizationCode: String? = null,
-        tokenString: String? = null,
-        token: Token? = null
+            authorizationCode: String? = null,
+            tokenString: String? = null,
+            token: Token? = null
     ): SpotifyClientAPI {
         val clientId = credentials.clientId
         val clientSecret = credentials.clientSecret
@@ -357,6 +358,7 @@ class SpotifyApiBuilderDsl {
                         automaticRefresh,
                         redirectUri ?: throw IllegalArgumentException(),
                         useCache,
+                        cacheLimit,
                         retryWhenRateLimited,
                         enableLogger
                 )
@@ -370,6 +372,7 @@ class SpotifyApiBuilderDsl {
                     automaticRefresh,
                     redirectUri ?: "not-set",
                     useCache,
+                    cacheLimit,
                     retryWhenRateLimited,
                     enableLogger
             )
@@ -386,6 +389,7 @@ class SpotifyApiBuilderDsl {
                     false,
                     redirectUri ?: "not-set",
                     useCache,
+                    cacheLimit,
                     retryWhenRateLimited,
                     enableLogger
             )