code cleanup

adamint · adamint · commit f53fd62e9327 · 2019-08-13T14:39:59.000-04:00
diff --git a/src/main/kotlin/com/adamratzman/spotify/SpotifyAPI.kt b/src/main/kotlin/com/adamratzman/spotify/SpotifyAPI.kt
@@ -31,7 +31,7 @@ import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import java.util.concurrent.Executors
 import java.util.concurrent.ScheduledExecutorService
 
-internal val base = "https://api.spotify.com/v1"
+internal const val base = "https://api.spotify.com/v1"
 
 /**
  * Represents an instance of the Spotify API client, with common
diff --git a/src/main/kotlin/com/adamratzman/spotify/endpoints/client/ClientFollowingAPI.kt b/src/main/kotlin/com/adamratzman/spotify/endpoints/client/ClientFollowingAPI.kt
@@ -77,7 +77,7 @@ class ClientFollowingAPI(api: SpotifyAPI) : FollowingAPI(api) {
             get(
                     EndpointBuilder("/me/following/contains").with("type", "user")
                             .with("ids", users.joinToString(",") { UserURI(it).id.encode() }).toString()
-            ).toArray<Boolean>(api)
+            ).toArray(api)
         })
     }
 
@@ -112,7 +112,7 @@ class ClientFollowingAPI(api: SpotifyAPI) : FollowingAPI(api) {
             get(
                     EndpointBuilder("/me/following/contains").with("type", "artist")
                             .with("ids", artists.joinToString(",") { ArtistURI(it).id.encode() }).toString()
-            ).toArray<Boolean>(api)
+            ).toArray(api)
         })
     }
 
@@ -137,7 +137,7 @@ class ClientFollowingAPI(api: SpotifyAPI) : FollowingAPI(api) {
                             "after",
                             after
                     ).toString()
-            ).toCursorBasedPagingObject<Artist>("artists", this)
+            ).toCursorBasedPagingObject("artists", this)
         })
     }
 
diff --git a/src/main/kotlin/com/adamratzman/spotify/endpoints/client/ClientLibraryAPI.kt b/src/main/kotlin/com/adamratzman/spotify/endpoints/client/ClientLibraryAPI.kt
@@ -43,7 +43,7 @@ class ClientLibraryAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
             get(
                     EndpointBuilder("/me/tracks").with("limit", limit).with("offset", offset).with("market", market?.name)
                             .toString()
-            ).toPagingObject<SavedTrack>(endpoint = this)
+            ).toPagingObject(endpoint = this)
         })
     }
 
@@ -68,7 +68,7 @@ class ClientLibraryAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
             get(
                     EndpointBuilder("/me/albums").with("limit", limit).with("offset", offset).with("market", market?.name)
                             .toString()
-            ).toPagingObject<SavedAlbum>(endpoint = this)
+            ).toPagingObject(endpoint = this)
         })
     }
 
@@ -103,7 +103,7 @@ class ClientLibraryAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
             get(
                     EndpointBuilder("/me/$type/contains").with("ids", ids.joinToString(",") { type.id(it).encode() })
                             .toString()
-            ).toArray<Boolean>(api)
+            ).toArray(api)
         })
     }
 
diff --git a/src/main/kotlin/com/adamratzman/spotify/endpoints/client/ClientPersonalizationAPI.kt b/src/main/kotlin/com/adamratzman/spotify/endpoints/client/ClientPersonalizationAPI.kt
@@ -58,7 +58,7 @@ class ClientPersonalizationAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
                     EndpointBuilder("/me/top/artists").with("limit", limit).with("offset", offset)
                             .with("time_range", timeRange).toString()
             )
-                    .toPagingObject<Artist>(endpoint = this)
+                    .toPagingObject(endpoint = this)
         })
     }
 
@@ -91,7 +91,7 @@ class ClientPersonalizationAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
                     EndpointBuilder("/me/top/tracks").with("limit", limit).with("offset", offset)
                             .with("time_range", timeRange).toString()
             )
-                    .toPagingObject<Track>(endpoint = this)
+                    .toPagingObject(endpoint = this)
         })
     }
 }
diff --git a/src/main/kotlin/com/adamratzman/spotify/endpoints/client/ClientPlayerAPI.kt b/src/main/kotlin/com/adamratzman/spotify/endpoints/client/ClientPlayerAPI.kt
@@ -38,7 +38,7 @@ class ClientPlayerAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
      */
     fun getDevices(): SpotifyRestAction<List<Device>> {
         return toAction(Supplier {
-            get(EndpointBuilder("/me/player/devices").toString()).toInnerObject<List<Device>>(
+            get(EndpointBuilder("/me/player/devices").toString()).toInnerObject(
                     "devices"
             )
         })
@@ -78,7 +78,7 @@ class ClientPlayerAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
             get(
                     EndpointBuilder("/me/player/recently-played")
                             .with("limit", limit).with("before", before).with("after", after).toString()
-            ).toCursorBasedPagingObject<PlayHistory>(
+            ).toCursorBasedPagingObject(
                     endpoint = this
             )
         })
diff --git a/src/main/kotlin/com/adamratzman/spotify/endpoints/client/ClientPlaylistAPI.kt b/src/main/kotlin/com/adamratzman/spotify/endpoints/client/ClientPlaylistAPI.kt
@@ -70,7 +70,7 @@ class ClientPlaylistAPI(api: SpotifyAPI) : PlaylistAPI(api) {
             post(
                     EndpointBuilder("/users/${UserURI(user).id.encode()}/playlists").toString(),
                     json.toJson()
-            ).toObject<Playlist>(api)
+            ).toObject(api)
         })
     }
 
@@ -173,7 +173,7 @@ class ClientPlaylistAPI(api: SpotifyAPI) : PlaylistAPI(api) {
         if (offset != null && offset !in 0..100000) throw IllegalArgumentException("Offset must be between 0 and 100,000. Provided $limit")
         return toActionPaging(Supplier {
             get(EndpointBuilder("/me/playlists").with("limit", limit).with("offset", offset).toString())
-                    .toPagingObject<SimplePlaylist>(endpoint = this)
+                    .toPagingObject(endpoint = this)
         })
     }
 
@@ -244,7 +244,7 @@ class ClientPlaylistAPI(api: SpotifyAPI) : PlaylistAPI(api) {
             put(
                     EndpointBuilder("/playlists/${PlaylistURI(playlist).id.encode()}/tracks").toString(),
                     json.toJson()
-            ).toObject<Snapshot>(api)
+            ).toObject(api)
         })
     }
 
@@ -423,7 +423,7 @@ class ClientPlaylistAPI(api: SpotifyAPI) : PlaylistAPI(api) {
             }.let { json.put("tracks", it) }
             delete(
                     EndpointBuilder("/playlists/${PlaylistURI(playlist).id}/tracks").toString(), body = json.toJson()
-            ).toObject<Snapshot>(api)
+            ).toObject(api)
         })
     }
 
diff --git a/src/main/kotlin/com/adamratzman/spotify/endpoints/client/ClientUserAPI.kt b/src/main/kotlin/com/adamratzman/spotify/endpoints/client/ClientUserAPI.kt
@@ -26,7 +26,7 @@ class ClientUserAPI(api: SpotifyAPI) : UserAPI(api) {
      */
     fun getUserProfile(): SpotifyRestAction<SpotifyUserInformation> {
         return toAction(Supplier {
-            get(EndpointBuilder("/me").toString()).toObject<SpotifyUserInformation>(api)
+            get(EndpointBuilder("/me").toString()).toObject(api)
         })
     }
 }
diff --git a/src/main/kotlin/com/adamratzman/spotify/endpoints/public/AlbumAPI.kt b/src/main/kotlin/com/adamratzman/spotify/endpoints/public/AlbumAPI.kt
@@ -35,7 +35,7 @@ class AlbumAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
         return toAction(Supplier {
             catch {
                 get(EndpointBuilder("/albums/${AlbumURI(album).id}").with("market", market?.name).toString())
-                        .toObject<Album>(api)
+                        .toObject(api)
             }
         })
     }
@@ -82,7 +82,7 @@ class AlbumAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
                             offset
                     ).with("market", market?.name)
                             .toString()
-            ).toPagingObject<SimpleTrack>(endpoint = this)
+            ).toPagingObject(endpoint = this)
         })
     }
 }
diff --git a/src/main/kotlin/com/adamratzman/spotify/endpoints/public/ArtistsAPI.kt b/src/main/kotlin/com/adamratzman/spotify/endpoints/public/ArtistsAPI.kt
@@ -37,7 +37,7 @@ class ArtistsAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
         return toAction(Supplier {
             catch {
                 get(EndpointBuilder("/artists/${ArtistURI(artist).id.encode()}").toString())
-                        .toObject<Artist>(api)
+                        .toObject(api)
             }
         })
     }
@@ -85,7 +85,7 @@ class ArtistsAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
                             offset
                     ).with("market", market?.name)
                             .with("include_groups", include.joinToString(",") { it.keyword }).toString()
-            ).toPagingObject<SimpleAlbum>(null, this)
+            ).toPagingObject(null, this)
         })
     }
 
@@ -120,7 +120,7 @@ class ArtistsAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
                             "country",
                             market.name
                     ).toString()
-            ).toInnerArray<Track>("tracks")
+            ).toInnerArray("tracks")
         })
     }
 
diff --git a/src/main/kotlin/com/adamratzman/spotify/endpoints/public/BrowseAPI.kt b/src/main/kotlin/com/adamratzman/spotify/endpoints/public/BrowseAPI.kt
@@ -39,7 +39,7 @@ class BrowseAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
      */
     fun getAvailableGenreSeeds(): SpotifyRestAction<List<String>> {
         return toAction(Supplier {
-            get(EndpointBuilder("/recommendations/available-genre-seeds").toString()).toInnerArray<String>(
+            get(EndpointBuilder("/recommendations/available-genre-seeds").toString()).toInnerArray(
                     "genres"
             )
         })
@@ -67,7 +67,7 @@ class BrowseAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
                             "country",
                             market?.name
                     ).toString()
-            ).toPagingObject<SimpleAlbum>(
+            ).toPagingObject(
                     "albums", endpoint = this
             )
         })
@@ -107,7 +107,7 @@ class BrowseAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
                             .with("locale", locale).with("timestamp", timestamp?.let {
                                 SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss").format(Date.from(Instant.ofEpochMilli(timestamp)))
                             }).toString()
-            ).toObject<FeaturedPlaylists>(api)
+            ).toObject(api)
         })
     }
 
@@ -138,7 +138,7 @@ class BrowseAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
                             "market",
                             market?.name
                     ).with("locale", locale).toString()
-            ).toPagingObject<SpotifyCategory>(
+            ).toPagingObject(
                     "categories", endpoint = this
             )
         })
@@ -166,7 +166,7 @@ class BrowseAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
             get(
                     EndpointBuilder("/browse/categories/${categoryId.encode()}").with("market", market?.name)
                             .with("locale", locale).toString()
-            ).toObject<SpotifyCategory>(api)
+            ).toObject(api)
         })
     }
 
@@ -194,7 +194,7 @@ class BrowseAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
                             limit
                     ).with("offset", offset)
                             .with("market", market?.name).toString()
-            ).toPagingObject<SimplePlaylist>("playlists", endpoint = this)
+            ).toPagingObject("playlists", endpoint = this)
         })
     }
 
@@ -301,10 +301,10 @@ class BrowseAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
                     .with("seed_artists", seedArtists?.joinToString(",") { ArtistURI(it).id.encode() })
                     .with("seed_genres", seedGenres?.joinToString(",") { it.encode() })
                     .with("seed_tracks", seedTracks?.joinToString(",") { TrackURI(it).id.encode() })
-            targetAttributes.forEach { attribute, value -> builder.with("target_$attribute", value) }
-            minAttributes.forEach { attribute, value -> builder.with("min_$attribute", value) }
-            maxAttributes.forEach { attribute, value -> builder.with("max_$attribute", value) }
-            get(builder.toString()).toObject<RecommendationResponse>(api)
+            targetAttributes.forEach { (attribute, value) -> builder.with("target_$attribute", value) }
+            minAttributes.forEach { (attribute, value) -> builder.with("min_$attribute", value) }
+            maxAttributes.forEach { (attribute, value) -> builder.with("max_$attribute", value) }
+            get(builder.toString()).toObject(api)
         })
     }
 }
diff --git a/src/main/kotlin/com/adamratzman/spotify/endpoints/public/FollowingAPI.kt b/src/main/kotlin/com/adamratzman/spotify/endpoints/public/FollowingAPI.kt
@@ -37,7 +37,7 @@ open class FollowingAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
             get(
                     EndpointBuilder("/users/${user.id.encode()}/playlists/${PlaylistURI(playlist).id.encode()}/followers/contains")
                             .with("ids", users.joinToString(",") { UserURI(it).id.encode() }).toString()
-            ).toArray<Boolean>(api)
+            ).toArray(api)
         })
     }
 
diff --git a/src/main/kotlin/com/adamratzman/spotify/endpoints/public/PlaylistAPI.kt b/src/main/kotlin/com/adamratzman/spotify/endpoints/public/PlaylistAPI.kt
@@ -57,7 +57,7 @@ open class PlaylistAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
                     EndpointBuilder("/users/${UserURI(user).id.encode()}/playlists").with("limit", limit).with(
                             "offset", offset
                     ).toString()
-            ).toPagingObject<SimplePlaylist>(endpoint = this)
+            ).toPagingObject(endpoint = this)
         })
     }
 
@@ -77,7 +77,7 @@ open class PlaylistAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
                 get(
                         EndpointBuilder("/playlists/${PlaylistURI(playlist).id.encode()}")
                                 .with("market", market?.name).toString()
-                ).toObject<Playlist>(api)
+                ).toObject(api)
             }
         })
     }
@@ -105,7 +105,7 @@ open class PlaylistAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
                     EndpointBuilder("/playlists/${PlaylistURI(playlist).id.encode()}/tracks").with("limit", limit)
                             .with("offset", offset).with("market", market?.name).toString()
             )
-                    .toPagingObject<PlaylistTrack>(null, this)
+                    .toPagingObject(null, this)
         })
     }
 
diff --git a/src/main/kotlin/com/adamratzman/spotify/endpoints/public/SearchAPI.kt b/src/main/kotlin/com/adamratzman/spotify/endpoints/public/SearchAPI.kt
@@ -53,7 +53,7 @@ class SearchAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
         market: CountryCode? = null
     ): SpotifyRestActionPaging<SimplePlaylist, PagingObject<SimplePlaylist>> {
         return toActionPaging(Supplier {
-            get(build(SearchType.PLAYLIST, query, limit, offset, market)).toPagingObject<SimplePlaylist>(
+            get(build(SearchType.PLAYLIST, query, limit, offset, market)).toPagingObject(
                     "playlists", this
             )
         })
@@ -78,7 +78,7 @@ class SearchAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
         market: CountryCode? = null
     ): SpotifyRestActionPaging<Artist, PagingObject<Artist>> {
         return toActionPaging(Supplier {
-            get(build(SearchType.ARTIST, query, limit, offset, market)).toPagingObject<Artist>(
+            get(build(SearchType.ARTIST, query, limit, offset, market)).toPagingObject(
                     "artists", this
             )
         })
@@ -103,7 +103,7 @@ class SearchAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
         market: CountryCode? = null
     ): SpotifyRestActionPaging<SimpleAlbum, PagingObject<SimpleAlbum>> {
         return toActionPaging(Supplier {
-            get(build(SearchType.ALBUM, query, limit, offset, market)).toPagingObject<SimpleAlbum>(
+            get(build(SearchType.ALBUM, query, limit, offset, market)).toPagingObject(
                     "albums", this
             )
         })
@@ -128,7 +128,7 @@ class SearchAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
         market: CountryCode? = null
     ): SpotifyRestActionPaging<Track, PagingObject<Track>> {
         return toActionPaging(Supplier {
-            get(build(SearchType.TRACK, query, limit, offset, market)).toPagingObject<Track>(
+            get(build(SearchType.TRACK, query, limit, offset, market)).toPagingObject(
                     "tracks", this
             )
         })
diff --git a/src/main/kotlin/com/adamratzman/spotify/endpoints/public/TracksAPI.kt b/src/main/kotlin/com/adamratzman/spotify/endpoints/public/TracksAPI.kt
@@ -34,7 +34,7 @@ class TracksAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
         return toAction(Supplier {
             catch {
                 get(EndpointBuilder("/tracks/${TrackURI(track).id.encode()}").with("market", market?.name).toString())
-                        .toObject<Track>(api)
+                        .toObject(api)
             }
         })
     }
@@ -74,7 +74,7 @@ class TracksAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
     fun getAudioAnalysis(track: String): SpotifyRestAction<AudioAnalysis> {
         return toAction(Supplier {
             get(EndpointBuilder("/audio-analysis/${TrackURI(track).id.encode()}").toString())
-                    .toObject<AudioAnalysis>(api)
+                    .toObject(api)
         })
     }
 
@@ -88,7 +88,7 @@ class TracksAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
     fun getAudioFeatures(track: String): SpotifyRestAction<AudioFeatures> {
         return toAction(Supplier {
             get(EndpointBuilder("/audio-features/${TrackURI(track).id.encode()}").toString())
-                    .toObject<AudioFeatures>(api)
+                    .toObject(api)
         })
     }
 
diff --git a/src/main/kotlin/com/adamratzman/spotify/endpoints/public/UserAPI.kt b/src/main/kotlin/com/adamratzman/spotify/endpoints/public/UserAPI.kt
@@ -27,7 +27,7 @@ open class UserAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
         return toAction(Supplier {
             catch {
                 get(EndpointBuilder("/users/${UserURI(user).id.encode()}").toString())
-                        .toObject<SpotifyPublicUser>(api)
+                        .toObject(api)
             }
         })
     }
diff --git a/src/main/kotlin/com/adamratzman/spotify/models/PagingObjects.kt b/src/main/kotlin/com/adamratzman/spotify/models/PagingObjects.kt
@@ -175,12 +175,12 @@ class CursorBasedPagingObject<T>(
         }
         return next?.let {
             val url = endpoint.get(it)
-            when {
-                itemClazz == PlayHistory::class.java -> url.toCursorBasedPagingObject<PlayHistory>(
+            when (itemClazz) {
+                PlayHistory::class.java -> url.toCursorBasedPagingObject<PlayHistory>(
                         null,
                         endpoint
                 )
-                itemClazz == Artist::class.java -> url.toCursorBasedPagingObject<Artist>(
+                Artist::class.java -> url.toCursorBasedPagingObject<Artist>(
                         null,
                         endpoint
                 )
diff --git a/src/main/kotlin/com/adamratzman/spotify/models/serialization/SerializationUtils.kt b/src/main/kotlin/com/adamratzman/spotify/models/serialization/SerializationUtils.kt
@@ -150,7 +150,7 @@ private fun <K, V> fromJsonMap(keyType: Type, valueType: Type, json: String): Ma
 }
 
 internal fun <K, V> mapAdapter(keyType: Type, valueType: Type): JsonAdapter<Map<K, V>> {
-    return moshi.adapter<Map<K, V>>(Types.newParameterizedType(Map::class.java, keyType, valueType))
+    return moshi.adapter(Types.newParameterizedType(Map::class.java, keyType, valueType))
 }
 
 internal fun mapAdapterJson(): JsonAdapter<Map<String, Any>> = mapAdapter(String::class.java, Any::class.java)

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ class ClientPersonalizationAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {`
`58`	`58`	`EndpointBuilder("/me/top/artists").with("limit", limit).with("offset", offset)`
`59`	`59`	`.with("time_range", timeRange).toString()`
`60`	`60`	`)`
`61`		`- .toPagingObject<Artist>(endpoint = this)`
	`61`	`+ .toPagingObject(endpoint = this)`
`62`	`62`	`})`
`63`	`63`	`}`
`64`	`64`
`@@ -91,7 +91,7 @@ class ClientPersonalizationAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {`
`91`	`91`	`EndpointBuilder("/me/top/tracks").with("limit", limit).with("offset", offset)`
`92`	`92`	`.with("time_range", timeRange).toString()`
`93`	`93`	`)`
`94`		`- .toPagingObject<Track>(endpoint = this)`
	`94`	`+ .toPagingObject(endpoint = this)`
`95`	`95`	`})`
`96`	`96`	`}`
`97`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class ClientUserAPI(api: SpotifyAPI) : UserAPI(api) {`
`26`	`26`	`*/`
`27`	`27`	`fun getUserProfile(): SpotifyRestAction<SpotifyUserInformation> {`
`28`	`28`	`return toAction(Supplier {`
`29`		`- get(EndpointBuilder("/me").toString()).toObject<SpotifyUserInformation>(api)`
	`29`	`+ get(EndpointBuilder("/me").toString()).toObject(api)`
`30`	`30`	`})`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class AlbumAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {`
`35`	`35`	`return toAction(Supplier {`
`36`	`36`	`catch {`
`37`	`37`	`get(EndpointBuilder("/albums/${AlbumURI(album).id}").with("market", market?.name).toString())`
`38`		`- .toObject<Album>(api)`
	`38`	`+ .toObject(api)`
`39`	`39`	`}`
`40`	`40`	`})`
`41`	`41`	`}`
`@@ -82,7 +82,7 @@ class AlbumAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {`
`82`	`82`	`offset`
`83`	`83`	`).with("market", market?.name)`
`84`	`84`	`.toString()`
`85`		`- ).toPagingObject<SimpleTrack>(endpoint = this)`
	`85`	`+ ).toPagingObject(endpoint = this)`
`86`	`86`	`})`
`87`	`87`	`}`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class ArtistsAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {`
`37`	`37`	`return toAction(Supplier {`
`38`	`38`	`catch {`
`39`	`39`	`get(EndpointBuilder("/artists/${ArtistURI(artist).id.encode()}").toString())`
`40`		`- .toObject<Artist>(api)`
	`40`	`+ .toObject(api)`
`41`	`41`	`}`
`42`	`42`	`})`
`43`	`43`	`}`
`@@ -85,7 +85,7 @@ class ArtistsAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {`
`85`	`85`	`offset`
`86`	`86`	`).with("market", market?.name)`
`87`	`87`	`.with("include_groups", include.joinToString(",") { it.keyword }).toString()`
`88`		`- ).toPagingObject<SimpleAlbum>(null, this)`
	`88`	`+ ).toPagingObject(null, this)`
`89`	`89`	`})`
`90`	`90`	`}`
`91`	`91`
`@@ -120,7 +120,7 @@ class ArtistsAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {`
`120`	`120`	`"country",`
`121`	`121`	`market.name`
`122`	`122`	`).toString()`
`123`		`- ).toInnerArray<Track>("tracks")`
	`123`	`+ ).toInnerArray("tracks")`
`124`	`124`	`})`
`125`	`125`	`}`
`126`	`126`