convert httpconnection bodymaps to java maps

Author: adamint

build.gradle

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

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

@@ -16,8 +16,8 @@ fun spotifyApi(block: SpotifyApiBuilderDsl.() -> Unit) = SpotifyApiBuilderDsl().
  * Spotify traditional Java style API builder
  */
 class SpotifyApiBuilder(
-    private var clientId: String,
-    private var clientSecret: String
+        private var clientId: String,
+        private var clientSecret: String
 ) {
     private var redirectUri: String? = null
     private var authorizationCode: String? = null
@@ -190,17 +190,17 @@ 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
 ) {
     fun build() = SpotifyUserAuthorization(authorizationCode, tokenString, token)
 }
 
 data class SpotifyUserAuthorization(
-    val authorizationCode: String?,
-    val tokenString: String?,
-    val token: Token?
+        val authorizationCode: String?,
+        val tokenString: String?,
+        val token: Token?
 )
 
 /**
@@ -215,17 +215,18 @@ data class SpotifyUserAuthorization(
  * @property enableAllUtilities Whether to enable all provided utilities
  */
 class SpotifyUtilitiesBuilder(
-    var useCache: Boolean = true,
-    var cacheLimit: Int? = 200,
-    var automaticRefresh: Boolean = true,
-    var retryWhenRateLimited: Boolean = true,
-    var enableLogger: Boolean = true,
-    var testTokenValidity: Boolean = false,
-    var enableAllUtilities: Boolean = false
+        var useCache: Boolean = true,
+        var cacheLimit: Int? = 200,
+        var automaticRefresh: Boolean = true,
+        var retryWhenRateLimited: Boolean = true,
+        var enableLogger: Boolean = true,
+        var testTokenValidity: Boolean = false,
+        var enableAllUtilities: Boolean = false
 ) {
     fun build() =
             if (enableAllUtilities)
-                SpotifyUtilities(true,
+                SpotifyUtilities(
+                        true,
                         200,
                         automaticRefresh = true,
                         retryWhenRateLimited = true,
@@ -244,12 +245,12 @@ class SpotifyUtilitiesBuilder(
 }
 
 data class SpotifyUtilities(
-    val useCache: Boolean,
-    val cacheLimit: Int?,
-    val automaticRefresh: Boolean,
-    val retryWhenRateLimited: Boolean,
-    val enableLogger: Boolean,
-    val testTokenValidity: Boolean
+        val useCache: Boolean,
+        val cacheLimit: Int?,
+        val automaticRefresh: Boolean,
+        val retryWhenRateLimited: Boolean,
+        val enableLogger: Boolean,
+        val testTokenValidity: Boolean
 )
 
 /**
@@ -397,9 +398,9 @@ class SpotifyApiBuilderDsl {
      * @param token [Token] object (useful if you already have exchanged an authorization code yourself
      */
     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
@@ -417,8 +418,12 @@ class SpotifyApiBuilderDsl {
                 val response = executeTokenRequest(HttpConnection(
                         url = "https://accounts.spotify.com/api/token",
                         method = HttpRequestMethod.POST,
-                        bodyMap = null,
-                        bodyString = "grant_type=authorization_code&code=$authorizationCode&redirect_uri=$redirectUri",
+                        bodyMap = mapOf(
+                                "grant_type" to "authorization_code",
+                                "code" to authorizationCode,
+                                "redirect_uri" to redirectUri
+                        ),
+                        bodyString = null,
                         contentType = "application/x-www-form-urlencoded",
                         api = null
                 ), clientId, clientSecret)

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

@@ -366,8 +366,11 @@ class SpotifyClientAPI internal constructor(
         val response = executeTokenRequest(HttpConnection(
                 url = "https://accounts.spotify.com/api/token",
                 method = HttpRequestMethod.POST,
-                bodyMap = null,
-                bodyString = "grant_type=refresh_token&refresh_token=${token.refreshToken ?: ""}",
+                bodyMap = mapOf(
+                        "grant_type" to "refresh_token",
+                        "refresh_token" to token.refreshToken
+                ),
+                bodyString = null,
                 contentType = "application/x-www-form-urlencoded",
                 api = this
         ), clientId, clientSecret)
@@ -452,8 +455,8 @@ fun getCredentialedToken(clientId: String, clientSecret: String, api: SpotifyAPI
     val response = executeTokenRequest(HttpConnection(
             url = "https://accounts.spotify.com/api/token",
             method = HttpRequestMethod.POST,
-            bodyMap = null,
-            bodyString = "grant_type=client_credentials",
+            bodyMap = mapOf("grant_type" to "client_credentials"),
+            bodyString = null,
             contentType = "application/x-www-form-urlencoded",
             api = api
     ), clientId, clientSecret)

src/main/kotlin/com/adamratzman/spotify/http/HttpConnection.kt

@@ -5,21 +5,20 @@ import com.adamratzman.spotify.SpotifyAPI
 import com.adamratzman.spotify.models.SpotifyRatelimitedException
 import com.google.api.client.http.ByteArrayContent
 import com.google.api.client.http.GenericUrl
-import com.google.api.client.http.UrlEncodedContent
 import com.google.api.client.http.javanet.NetHttpTransport
 import java.util.concurrent.TimeUnit
 
 enum class HttpRequestMethod { GET, POST, PUT, DELETE }
 data class HttpHeader(val key: String, val value: String)
 
 internal class HttpConnection(
-    private val url: String,
-    private val method: HttpRequestMethod,
-    private val bodyMap: Map<Any, Any>?,
-    private val bodyString: String?,
-    private val contentType: String?,
-    private val headers: List<HttpHeader> = listOf(),
-    val api: SpotifyAPI? = null
+        private val url: String,
+        private val method: HttpRequestMethod,
+        private val bodyMap: Map<*, *>?,
+        private val bodyString: String?,
+        private val contentType: String?,
+        private val headers: List<HttpHeader> = listOf(),
+        val api: SpotifyAPI? = null
 ) {
 
     companion object {
@@ -33,9 +32,8 @@ internal class HttpConnection(
             HttpRequestMethod.DELETE -> requestFactory.buildDeleteRequest(genericUrl)
             HttpRequestMethod.PUT, HttpRequestMethod.POST -> {
                 val content = if (contentType == "application/x-www-form-urlencoded") {
-                    bodyMap?.let { body ->
-                        UrlEncodedContent(body.map { it.key.toString() to it.value.toString() }.toMap())
-                    } ?: ByteArrayContent.fromString(contentType, bodyString)
+                    bodyMap?.map { "${it.key}=${it.value}" }?.joinToString("&")?.let { ByteArrayContent.fromString(contentType, it) }
+                            ?: ByteArrayContent.fromString(contentType, bodyString)
                 } else bodyString?.let { ByteArrayContent.fromString(contentType, bodyString) }
 
                 if (method == HttpRequestMethod.PUT) requestFactory.buildPutRequest(genericUrl, content)