recursively instantiate api/pagingobject (fixes #237)

Signed-off-by: Adam Ratzman <[email protected]>

Author: adamint

build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
     id("io.codearte.nexus-staging") version "0.22.0"
     id("com.android.library")
     kotlin("multiplatform") version "1.4.21"
-    kotlin("plugin.serialization") version "1.4.21"
+    kotlin("plugin.serialization") version "1.4.20"
     id("com.diffplug.gradle.spotless") version "4.4.0"
     id("com.moowork.node") version "1.3.1"
     id("org.jetbrains.dokka") version "1.4.20"
@@ -213,7 +213,7 @@ kotlin {
         sourceSets {
             val coroutineVersion = "1.4.2-native-mt"
             val serializationVersion = "1.0.1"
-            val ktorVersion = "1.4.1"
+            val ktorVersion = "1.5.0"
             val kotlinxDatetimeVersion = "0.1.1"
 
             val commonMain by getting {

src/commonMain/kotlin/com.adamratzman.spotify/SpotifyApi.kt

@@ -84,6 +84,8 @@ public sealed class SpotifyApi<T : SpotifyApi<T, B>, B : ISpotifyApiBuilder<T, B
      */
     internal val spotifyApiBase = "https://api.spotify.com/v1"
 
+    internal val defaultEndpoint get() = tracks
+
     init {
         spotifyApiOptions.requiredScopes?.let { requiredScopes ->
             val tokenScopes = token.scopes ?: listOf()

src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientFollowingApi.kt

@@ -137,7 +137,7 @@ public class ClientFollowingApi(api: GenericSpotifyApi) : FollowingApi(api) {
             "after",
             after
         ).toString()
-    ).toCursorBasedPagingObject(Artist::class, Artist.serializer(), "artists", this, json)
+    ).toCursorBasedPagingObject(Artist::class, Artist.serializer(), "artists", api, json)
 
     /**
      * Add the current user as a follower of another user

src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientLibraryApi.kt

@@ -6,7 +6,9 @@ import com.adamratzman.spotify.SpotifyException.BadRequestException
 import com.adamratzman.spotify.SpotifyScope
 import com.adamratzman.spotify.http.SpotifyEndpoint
 import com.adamratzman.spotify.http.encodeUrl
+import com.adamratzman.spotify.models.AlbumUri
 import com.adamratzman.spotify.models.PagingObject
+import com.adamratzman.spotify.models.PlayableUri
 import com.adamratzman.spotify.models.SavedAlbum
 import com.adamratzman.spotify.models.SavedTrack
 import com.adamratzman.spotify.models.serialization.toList
@@ -42,7 +44,7 @@ public class ClientLibraryApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
     ): PagingObject<SavedTrack> = get(
         endpointBuilder("/me/tracks").with("limit", limit).with("offset", offset).with("market", market?.name)
             .toString()
-    ).toNonNullablePagingObject(SavedTrack.serializer(), endpoint = this, json = json)
+    ).toNonNullablePagingObject(SavedTrack.serializer(), api = api, json = json)
 
     /**
      * Get a list of the albums saved in the current Spotify user’s ‘Your Music’ library.
@@ -65,7 +67,7 @@ public class ClientLibraryApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
     ): PagingObject<SavedAlbum> = get(
         endpointBuilder("/me/albums").with("limit", limit).with("offset", offset).with("market", market?.name)
             .toString()
-    ).toNonNullablePagingObject(SavedAlbum.serializer(), endpoint = this, json = json)
+    ).toNonNullablePagingObject(SavedAlbum.serializer(), api = api, json = json)
 
     /**
      * Check if the [LibraryType] with id [id] is already saved in the current Spotify user’s ‘Your Music’ library.

src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientPersonalizationApi.kt

@@ -69,7 +69,7 @@ public class ClientPersonalizationApi(api: GenericSpotifyApi) : SpotifyEndpoint(
     ): PagingObject<Artist> = get(
         endpointBuilder("/me/top/artists").with("limit", limit).with("offset", offset)
             .with("time_range", timeRange).toString()
-    ).toNonNullablePagingObject(Artist.serializer(), endpoint = this, json = json)
+    ).toNonNullablePagingObject(Artist.serializer(), api = api, json = json)
 
     /**
      * Get the current user’s top tracks based on calculated affinity.
@@ -99,5 +99,5 @@ public class ClientPersonalizationApi(api: GenericSpotifyApi) : SpotifyEndpoint(
     ): PagingObject<Track> = get(
         endpointBuilder("/me/top/tracks").with("limit", limit).with("offset", offset)
             .with("time_range", timeRange).toString()
-    ).toNonNullablePagingObject(Track.serializer(), endpoint = this, json = json)
+    ).toNonNullablePagingObject(Track.serializer(), api = api, json = json)
 }

src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientPlayerApi.kt

@@ -13,9 +13,9 @@ import com.adamratzman.spotify.models.CursorBasedPagingObject
 import com.adamratzman.spotify.models.Device
 import com.adamratzman.spotify.models.PlayHistory
 import com.adamratzman.spotify.models.PlayableUri
+import com.adamratzman.spotify.models.serialization.mapToJsonString
 import com.adamratzman.spotify.models.serialization.toCursorBasedPagingObject
 import com.adamratzman.spotify.models.serialization.toInnerObject
-import com.adamratzman.spotify.models.serialization.mapToJsonString
 import com.adamratzman.spotify.models.serialization.toObject
 import com.adamratzman.spotify.utils.catch
 import com.adamratzman.spotify.utils.jsonMap
@@ -79,7 +79,7 @@ public class ClientPlayerApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
     ): CursorBasedPagingObject<PlayHistory> = get(
         endpointBuilder("/me/player/recently-played")
             .with("limit", limit).with("before", before).with("after", after).toString()
-    ).toCursorBasedPagingObject(PlayHistory::class, PlayHistory.serializer(), endpoint = this, json = json)
+    ).toCursorBasedPagingObject(PlayHistory::class, PlayHistory.serializer(), api = api, json = json)
 
     /**
      * Get the object currently being played on the user’s Spotify account.

src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientPlaylistApi.kt

@@ -6,13 +6,17 @@ import com.adamratzman.spotify.SpotifyClientApi
 import com.adamratzman.spotify.SpotifyException.BadRequestException
 import com.adamratzman.spotify.SpotifyScope
 import com.adamratzman.spotify.endpoints.public.PlaylistApi
+import com.adamratzman.spotify.http.encodeUrl
 import com.adamratzman.spotify.models.ErrorObject
 import com.adamratzman.spotify.models.PagingObject
+import com.adamratzman.spotify.models.PlayableUri
 import com.adamratzman.spotify.models.Playlist
+import com.adamratzman.spotify.models.PlaylistUri
 import com.adamratzman.spotify.models.SimplePlaylist
+import com.adamratzman.spotify.models.UserUri
 import com.adamratzman.spotify.models.serialization.mapToJsonString
-import com.adamratzman.spotify.models.serialization.toObject
 import com.adamratzman.spotify.models.serialization.toNonNullablePagingObject
+import com.adamratzman.spotify.models.serialization.toObject
 import com.adamratzman.spotify.utils.BufferedImage
 import com.adamratzman.spotify.utils.File
 import com.adamratzman.spotify.utils.convertFileToBufferedImage
@@ -184,7 +188,7 @@ public class ClientPlaylistApi(api: GenericSpotifyApi) : PlaylistApi(api) {
         require(!(limit != null && limit !in 1..50)) { "Limit must be between 1 and 50. Provided $limit" }
         require(!(offset != null && offset !in 0..100000)) { "Offset must be between 0 and 100,000. Provided $limit" }
         return get(endpointBuilder("/me/playlists").with("limit", limit).with("offset", offset).toString())
-            .toNonNullablePagingObject(SimplePlaylist.serializer(), endpoint = this, json = json)
+            .toNonNullablePagingObject(SimplePlaylist.serializer(), api = api, json = json)
     }
 
     /**

src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientSearchApi.kt

@@ -39,7 +39,7 @@ public class ClientSearchApi(api: GenericSpotifyApi) : SearchApi(api) {
         offset: Int? = null,
         market: Market? = null
     ): PagingObject<SimpleShow> = get(build(query, market, limit, offset, SearchType.SHOW))
-            .toNonNullablePagingObject(SimpleShow.serializer(), "shows", this, json)
+            .toNonNullablePagingObject(SimpleShow.serializer(), "shows", api, json)
 
     /**
      * Get Spotify Catalog information about episodes that match the keyword string. See [SearchApi.search] for more information
@@ -63,5 +63,5 @@ public class ClientSearchApi(api: GenericSpotifyApi) : SearchApi(api) {
         offset: Int? = null,
         market: Market? = null
     ): PagingObject<SimpleEpisode> = get(build(query, market, limit, offset, SearchType.EPISODE))
-                .toNonNullablePagingObject(SimpleEpisode.serializer(), "episodes", this, json)
+                .toNonNullablePagingObject(SimpleEpisode.serializer(), "episodes", api, json)
 }

src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/AlbumApi.kt

@@ -4,12 +4,14 @@ package com.adamratzman.spotify.endpoints.public
 import com.adamratzman.spotify.GenericSpotifyApi
 import com.adamratzman.spotify.SpotifyException.BadRequestException
 import com.adamratzman.spotify.http.SpotifyEndpoint
+import com.adamratzman.spotify.http.encodeUrl
 import com.adamratzman.spotify.models.Album
+import com.adamratzman.spotify.models.AlbumUri
 import com.adamratzman.spotify.models.AlbumsResponse
 import com.adamratzman.spotify.models.PagingObject
 import com.adamratzman.spotify.models.SimpleTrack
-import com.adamratzman.spotify.models.serialization.toObject
 import com.adamratzman.spotify.models.serialization.toNonNullablePagingObject
+import com.adamratzman.spotify.models.serialization.toObject
 import com.adamratzman.spotify.utils.Market
 import com.adamratzman.spotify.utils.catch
 
@@ -83,5 +85,5 @@ public class AlbumApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
             offset
         ).with("market", market?.name)
             .toString()
-    ).toNonNullablePagingObject(SimpleTrack.serializer(), endpoint = this, json = json)
+    ).toNonNullablePagingObject(SimpleTrack.serializer(), api = api, json = json)
 }

src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/ArtistApi.kt

@@ -4,15 +4,17 @@ package com.adamratzman.spotify.endpoints.public
 import com.adamratzman.spotify.GenericSpotifyApi
 import com.adamratzman.spotify.SpotifyException.BadRequestException
 import com.adamratzman.spotify.http.SpotifyEndpoint
+import com.adamratzman.spotify.http.encodeUrl
 import com.adamratzman.spotify.models.Artist
 import com.adamratzman.spotify.models.ArtistList
+import com.adamratzman.spotify.models.ArtistUri
 import com.adamratzman.spotify.models.CursorBasedPagingObject
 import com.adamratzman.spotify.models.PagingObject
 import com.adamratzman.spotify.models.SimpleAlbum
 import com.adamratzman.spotify.models.Track
 import com.adamratzman.spotify.models.serialization.toInnerArray
-import com.adamratzman.spotify.models.serialization.toObject
 import com.adamratzman.spotify.models.serialization.toNonNullablePagingObject
+import com.adamratzman.spotify.models.serialization.toObject
 import com.adamratzman.spotify.utils.Market
 import com.adamratzman.spotify.utils.catch
 import kotlinx.serialization.builtins.ListSerializer
@@ -87,7 +89,7 @@ public class ArtistApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
             offset
         ).with("market", market?.name)
             .with("include_groups", include.joinToString(",") { it.keyword }).toString()
-    ).toNonNullablePagingObject(SimpleAlbum.serializer(), null, this, json)
+    ).toNonNullablePagingObject(SimpleAlbum.serializer(), null, api, json)
 
     /**
      * Describes object types to include when finding albums