add missing parameters

Author: adamint

.idea/modules/SpotifyKotlinWrapper.iml

@@ -8,6 +8,11 @@ import java.util.function.Supplier
  * Endpoints for retrieving information about the user’s listening habits.
  */
 class PersonalizationAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
+    enum class TimeRange(val id: String) {
+        LONG_TERM("long_term"), MEDIUM_TERM("medium_term"), SHORT_TERM("short_term");
+        override fun toString() = id
+    }
+
     /**
      * Get the current user’s top artists based on calculated affinity.
      * Affinity is a measure of the expected preference a user has for a particular track or artist.  It is based on user
@@ -20,9 +25,10 @@ class PersonalizationAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
      *
      * @return [PagingObject] of full [Artist] objects sorted by affinity
      */
-    fun getTopArtists(): SpotifyRestAction<PagingObject<Artist>> {
+    fun getTopArtists(limit: Int? = null, offset: Int? = null, timeRange: TimeRange? = null): SpotifyRestAction<PagingObject<Artist>> {
         return toAction(Supplier {
-            get(EndpointBuilder("/me/top/artists").build()).toPagingObject<Artist>(endpoint = this)
+            get(EndpointBuilder("/me/top/artists").with("limit", limit).with("offset", offset)
+                    .with("time_range", timeRange).build()).toPagingObject<Artist>(endpoint = this)
         })
     }
 
@@ -38,9 +44,10 @@ class PersonalizationAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
      *
      * @return [PagingObject] of full [Track] objects sorted by affinity
      */
-    fun getTopTracks(): SpotifyRestAction<PagingObject<Track>> {
+    fun getTopTracks(limit: Int? = null, offset: Int? = null, timeRange: TimeRange? = null): SpotifyRestAction<PagingObject<Track>> {
         return toAction(Supplier {
-            get(EndpointBuilder("/me/top/tracks").build()).toPagingObject<Track>(endpoint = this)
+            get(EndpointBuilder("/me/top/tracks").with("limit", limit).with("offset", offset)
+                    .with("time_range", timeRange).build()).toPagingObject<Track>(endpoint = this)
         })
     }
 

.idea/modules/SpotifyKotlinWrapper_main.iml

@@ -42,7 +42,7 @@ class ArtistsAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
      *
      * @throws BadRequestException if [artistId] is not found, or filter parameters are illegal
      */
-    fun getArtistAlbums(artistId: String, limit: Int = 20, offset: Int = 0, market: Market? = null, include: List<AlbumInclusionStrategy> = listOf()): SpotifyRestAction<LinkedResult<SimpleAlbum>> {
+    fun getArtistAlbums(artistId: String, limit: Int? = null, offset: Int? = null, market: Market? = null, include: List<AlbumInclusionStrategy> = listOf()): SpotifyRestAction<LinkedResult<SimpleAlbum>> {
         return toAction(Supplier {
             get(EndpointBuilder("/artists/${artistId.encode()}/albums").with("limit", limit).with("offset", offset).with("market", market?.code)
                     .with("include_groups", include.joinToString(",") { it.keyword }).build()).toLinkedResult<SimpleAlbum>(api)
@@ -60,7 +60,7 @@ class ArtistsAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
      *
      * @throws BadRequestException if tracks are not available in the specified [Market] or the [artistId] is not found
      */
-    fun getArtistTopTracks(artistId: String, market: Market): SpotifyRestAction<List<Track>> {
+    fun getArtistTopTracks(artistId: String, market: Market = Market.US): SpotifyRestAction<List<Track>> {
         return toAction(Supplier {
             get(EndpointBuilder("/artists/${artistId.encode()}/top-tracks").with("country", market.code).build())
                     .toObject<TrackList>(api).tracks.map { it!! }

.idea/modules/SpotifyKotlinWrapper_test.iml

@@ -57,12 +57,14 @@ abstract class SpotifyEndpoint(val api: SpotifyAPI) {
 }
 
 internal class EndpointBuilder(val path: String) {
-    private val builder = StringBuilder(base)
+    val builder = StringBuilder(base)
+
     init {
         builder.append(path)
     }
-    fun with(key: String, value: Any?):EndpointBuilder {
-        if (value != null && (value !is String || value.isNotEmpty()) ) {
+
+    fun with(key: String, value: Any?): EndpointBuilder {
+        if (value != null && (value !is String || value.isNotEmpty())) {
             if (builder.toString() == base + path) builder.append("?")
             else builder.append("&")
             builder.append(key).append("=").append(value.toString())
@@ -74,11 +76,29 @@ internal class EndpointBuilder(val path: String) {
 }
 
 data class CursorBasedPagingObject<out T>(val href: String, val items: List<T>, val limit: Int, val next: String?, val cursors: Cursor,
-                                          val total: Int, val endpoint: SpotifyEndpoint)
+                                          val total: Int, val endpoint: SpotifyEndpoint) {
+    inline fun <reified T> getNext(): SpotifyRestAction<CursorBasedPagingObject<T>> = endpoint.toAction(
+            Supplier {
+                next?.let { endpoint.get(it).toCursorBasedPagingObject<T>(endpoint = endpoint) }
+                        ?: throw IllegalStateException("PagingObject#next is null!")
+            })
+}
 
 data class Cursor(val after: String)
 data class PagingObject<out T>(val href: String, val items: List<T>, val limit: Int, val next: String? = null, val offset: Int = 0,
-                               val previous: String? = null, val total: Int, val endpoint: SpotifyEndpoint)
+                               val previous: String? = null, val total: Int, val endpoint: SpotifyEndpoint) {
+    inline fun <reified T> getNext(): SpotifyRestAction<PagingObject<T>> = endpoint.toAction(
+            Supplier {
+                next?.let { endpoint.get(it).toPagingObject<T>(endpoint = endpoint) }
+                        ?: throw IllegalStateException("PagingObject#next is null!")
+            })
+
+    inline fun <reified T> getPrevious(): SpotifyRestAction<PagingObject<T>> = endpoint.toAction(
+            Supplier {
+                previous?.let { endpoint.get(it).toPagingObject<T>(endpoint = endpoint) }
+                        ?: throw IllegalStateException("PagingObject#previous is null!")
+            })
+}
 
 data class LinkedResult<out T>(val href: String, val items: List<T>) {
     fun toPlaylistParams(): PlaylistParams {

src/main/kotlin/com/adamratzman/spotify/endpoints/priv/personalization/PersonalizationAPI.kt

@@ -1,12 +1,13 @@
 package com.adamratzman.spotify.kotlin.endpoints.pub.playlists
 
 import api
+import com.adamratzman.spotify.utils.SimplePlaylist
 import org.junit.Test
 
 internal class PlaylistsAPITest {
     @Test
     fun getPlaylists() {
-        println(api.playlists.getPlaylists("wizzler").complete())
+        println(api.playlists.getPlaylists("wizzler", limit = 3).complete().getNext<SimplePlaylist>().complete())
     }
 
     @Test