fix converters

Author: adamint

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

@@ -181,7 +181,7 @@ class SpotifyClientAPI internal constructor(
         } else {
             this.token = tempToken.copy(
                     refreshToken = tempToken.refreshToken ?: this.token.refreshToken,
-                    scopes = tempToken.scopes ?: this.token.scopes
+                    scopes = tempToken.scopes
             )
             logger.logInfo("Successfully refreshed the Spotify token")
         }

src/main/kotlin/com/adamratzman/spotify/models/serialization/KlaxonConverters.kt

@@ -3,7 +3,6 @@ package com.adamratzman.spotify.models.serialization
 
 import com.adamratzman.spotify.SpotifyAPI
 import com.adamratzman.spotify.models.Album
-import com.adamratzman.spotify.models.AlbumURI
 import com.adamratzman.spotify.models.FeaturedPlaylists
 import com.adamratzman.spotify.models.Followers
 import com.adamratzman.spotify.models.Playlist
@@ -21,21 +20,21 @@ internal fun getPublicUserConverter(api: SpotifyAPI) = object : Converter {
         return jv.obj?.let { obj ->
             if (obj.string("id")?.isNotBlank() == true) {
                 SpotifyPublicUser(
-                        obj.string("display_name"),
                         obj.obj("external_urls")!!.map.mapValues { it.value as String },
-                        obj.obj("followers")?.let { api.klaxon.parseFromJsonObject<Followers>(it) }
-                                ?: Followers(null, -1),
                         obj.string("href")!!,
                         obj.string("id")!!,
+                        obj.string("uri")!!,
+                        obj.string("display_name"),
+                        obj.obj("followers")?.let { api.klaxon.parseFromJsonObject<Followers>(it) }
+                                ?: Followers(null, -1),
                         obj.array("images") ?: listOf(),
-                        obj.string("type")!!,
-                        obj.string("uri")!!
-                )
+                        obj.string("type")!!
+                        )
             } else {
                 // this is the *Spotify* user, and is SOMEHOW broken
                 SpotifyPublicUser(
-                        externalUrls = hashMapOf(), href = "https://api.spotify.com/v1/users/spotify",
-                        id = "spotify", type = "user", _uri = "spotify:user:spotify"
+                        _externalUrls = hashMapOf(), _href = "https://api.spotify.com/v1/users/spotify",
+                        _id = "spotify", type = "user", _uri = "spotify:user:spotify"
                 )
             }
         }
@@ -70,14 +69,15 @@ internal fun getAlbumConverter(api: SpotifyAPI) = object : Converter {
         return jv.obj?.let { obj ->
             return Album(
                     obj.string("album_type")!!,
-                    obj.array("artists")!!,
                     obj.array("available_markets") ?: listOf(),
-                    obj.array("copyrights")!!,
-                    obj.obj("external_ids")!!.map.mapValues { it.value as String },
                     obj.obj("external_urls")!!.map.mapValues { it.value as String },
-                    obj.array("genres")!!,
+                    obj.obj("external_ids")!!.map.mapValues { it.value as String },
                     obj.string("href")!!,
                     obj.string("id")!!,
+                    obj.string("uri")!!,
+                    obj.array("artists")!!,
+                    obj.array("copyrights")!!,
+                    obj.array("genres")!!,
                     obj.array("images")!!,
                     obj.string("label")!!,
                     obj.string("name")!!,
@@ -86,8 +86,6 @@ internal fun getAlbumConverter(api: SpotifyAPI) = object : Converter {
                     obj.string("release_date_precision")!!,
                     obj.obj("tracks")!!.toJsonString().toPagingObject(endpoint = api.tracks),
                     obj.string("type")!!,
-                    obj.string("uri")!!,
-                    AlbumURI(obj.string("uri")!!),
                     obj.int("total_tracks")!!
             )
         }
@@ -121,21 +119,21 @@ internal fun getPlaylistConverter(api: SpotifyAPI) = object : Converter {
     override fun fromJson(jv: JsonValue): Any? {
         return jv.obj?.let { obj ->
             return Playlist(
-                    obj.boolean("collaborative")!!,
-                    obj.string("description")!!,
                     obj.obj("external_urls")!!.map.mapValues { it.value as String },
-                    api.klaxon.parseFromJsonObject(obj.obj("followers")!!)!!,
                     obj.string("href")!!,
                     obj.string("id")!!,
+                    obj.string("uri")!!,
+                    obj.boolean("collaborative")!!,
+                    obj.string("description")!!,
+                    api.klaxon.parseFromJsonObject(obj.obj("followers")!!)!!,
                     obj.string("primary_color"),
                     obj.array("images")!!,
                     obj.string("name")!!,
                     api.klaxon.parseFromJsonObject(obj.obj("owner")!!)!!,
                     obj.boolean("public"),
                     obj.string("snapshot_id")!!,
                     obj.obj("tracks")!!.toJsonString().toPagingObject(endpoint = api.tracks),
-                    obj.string("type")!!,
-                    obj.string("uri")!!
+                    obj.string("type")!!
             )
         }
     }