allow adding data to requests

adamint · adamint · commit b220f7efa893 · 2018-05-07T07:52:10.000-04:00
diff --git a/.idea/modules/SpotifyKotlinWrapper.iml b/.idea/modules/SpotifyKotlinWrapper.iml
diff --git a/.idea/modules/SpotifyKotlinWrapper_main.iml b/.idea/modules/SpotifyKotlinWrapper_main.iml
diff --git a/.idea/modules/SpotifyKotlinWrapper_test.iml b/.idea/modules/SpotifyKotlinWrapper_test.iml
diff --git a/README.md b/README.md
@@ -204,6 +204,6 @@ links provided for each API below
         1. `createPlaylist` creates the playlist and returns its full Playlist representation
         2. `addTrackToPlaylist` adds the entered tracks to the playlist. Returns nothing
         3. `changePlaylistDescription` changes the description of the playlist. Returns nothing
-        4. `getUserPlaylists` returns a `PagingObject` of SimplePlaylists the user has created
+        4. `getClientPlaylists` returns a `PagingObject` of SimplePlaylists the user has created
         5. `reorderTracks` reorders the tracks in the playlist and returns the current Snapshot
         6. `replaceTracks` replaces tracks in the playlist and returns the current Snapshot
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 group 'com.adamratzman'
-version '3.1.1'
+version '3.1.2'
 
 buildscript {
     ext.kotlin_version = '1.2.31'
diff --git a/src/main/kotlin/com/adamratzman/spotify/endpoints/priv/follow/ClientFollowAPI.kt b/src/main/kotlin/com/adamratzman/spotify/endpoints/priv/follow/ClientFollowAPI.kt
@@ -7,7 +7,7 @@ import java.util.function.Supplier
 /**
  * These endpoints allow you manage the artists, users and playlists that a Spotify user follows.
  */
-class UserFollowAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
+class ClientFollowAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
     /**
      * Check to see if the current user is following another Spotify users.
      *
diff --git a/src/main/kotlin/com/adamratzman/spotify/endpoints/priv/library/ClientLibraryAPI.kt b/src/main/kotlin/com/adamratzman/spotify/endpoints/priv/library/ClientLibraryAPI.kt
@@ -8,7 +8,7 @@ import java.util.function.Supplier
 /**
  * Endpoints for retrieving information about, and managing, tracks that the current user has saved in their “Your Music” library.
  */
-class UserLibraryAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
+class ClientLibraryAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
     /**
      * Get a list of the songs saved in the current Spotify user’s ‘Your Music’ library.
      *
diff --git a/src/main/kotlin/com/adamratzman/spotify/endpoints/priv/playlists/ClientPlaylistAPI.kt b/src/main/kotlin/com/adamratzman/spotify/endpoints/priv/playlists/ClientPlaylistAPI.kt
@@ -16,7 +16,7 @@ import javax.xml.bind.DatatypeConverter
 /**
  * Endpoints for retrieving information about a user’s playlists and for managing a user’s playlists.
  */
-class UserPlaylistAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
+class ClientPlaylistAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
     /**
      * Create a playlist for a Spotify user. (The playlist will be empty until you add tracks.)
      *
@@ -187,7 +187,19 @@ class UserPlaylistAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
             Unit
         })
     }
-
+    /*
+    fun removeAllOccurances(userId: String, playlistId: String, vararg trackIds: String): SpotifyRestAction<Unit> {
+        if (trackIds.isEmpty()) throw IllegalArgumentException("Tracks to remove must not be empty")
+        return toAction(Supplier {
+            val json = JSONObject()
+            json.put("tracks", trackIds.map { JSONObject().put("uri", "spotify:track:$it") })
+            println(json.toString())
+            delete("https://api.spotify.com/v1/users/$userId/playlists/$playlistId/tracks",
+                    body =  json.toString(), contentType = "application/json")
+            Unit
+        })
+    }
+*/
     private fun encode(image: BufferedImage): String {
         val bos = ByteArrayOutputStream()
         ImageIO.write(image, "jpg", bos)
diff --git a/src/main/kotlin/com/adamratzman/spotify/endpoints/priv/users/ClientProfileAPI.kt b/src/main/kotlin/com/adamratzman/spotify/endpoints/priv/users/ClientProfileAPI.kt
@@ -10,7 +10,7 @@ import java.util.function.Supplier
 /**
  * Endpoints for retrieving information about a user’s profile.
  */
-class UserAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
+class ClientProfileAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
     /**
      * Get detailed profile information about the current user (including the current user’s username).
      *
diff --git a/src/main/kotlin/com/adamratzman/spotify/main/SpotifyAPI.kt b/src/main/kotlin/com/adamratzman/spotify/main/SpotifyAPI.kt
@@ -1,11 +1,11 @@
 package com.adamratzman.spotify.main
 
-import com.adamratzman.spotify.endpoints.priv.follow.UserFollowAPI
-import com.adamratzman.spotify.endpoints.priv.library.UserLibraryAPI
+import com.adamratzman.spotify.endpoints.priv.follow.ClientFollowAPI
+import com.adamratzman.spotify.endpoints.priv.library.ClientLibraryAPI
 import com.adamratzman.spotify.endpoints.priv.personalization.PersonalizationAPI
 import com.adamratzman.spotify.endpoints.priv.player.PlayerAPI
-import com.adamratzman.spotify.endpoints.priv.playlists.UserPlaylistAPI
-import com.adamratzman.spotify.endpoints.priv.users.UserAPI
+import com.adamratzman.spotify.endpoints.priv.playlists.ClientPlaylistAPI
+import com.adamratzman.spotify.endpoints.priv.users.ClientProfileAPI
 import com.adamratzman.spotify.endpoints.pub.album.AlbumAPI
 import com.adamratzman.spotify.endpoints.pub.artists.ArtistsAPI
 import com.adamratzman.spotify.endpoints.pub.browse.BrowseAPI
@@ -70,11 +70,11 @@ open class SpotifyAPI internal constructor(val clientId: String?, val clientSecr
 
 class SpotifyClientAPI private constructor(clientId: String, clientSecret: String, token: Token, automaticRefresh: Boolean = false) : SpotifyAPI(clientId, clientSecret, token) {
     val personalization = PersonalizationAPI(this)
-    val userProfile = UserAPI(this)
-    val userLibrary = UserLibraryAPI(this)
-    val userFollowing = UserFollowAPI(this)
+    val clientProfile = ClientProfileAPI(this)
+    val clientLibrary = ClientLibraryAPI(this)
+    val clientFollowing = ClientFollowAPI(this)
     val player = PlayerAPI(this)
-    val userPlaylists = UserPlaylistAPI(this)
+    val clientPlaylists = ClientPlaylistAPI(this)
 
     init {
         if (automaticRefresh) {
diff --git a/src/main/kotlin/com/adamratzman/spotify/utils/Helpers.kt b/src/main/kotlin/com/adamratzman/spotify/utils/Helpers.kt
@@ -24,16 +24,18 @@ abstract class SpotifyEndpoint(val api: SpotifyAPI) {
         return execute(url, body, Connection.Method.PUT, contentType = contentType)
     }
 
-    fun delete(url: String, body: String? = null): String {
-        return execute(url, body, Connection.Method.DELETE)
+    fun delete(url: String, body: String? = null, data: List<Pair<String, String>>? = null, contentType: String? = null): String {
+        return execute(url, body, Connection.Method.DELETE, data = data, contentType = contentType)
     }
 
-    private fun execute(url: String, body: String? = null, method: Connection.Method = Connection.Method.GET, retry202: Boolean = true, contentType: String? = null): String {
+    private fun execute(url: String, body: String? = null, method: Connection.Method = Connection.Method.GET,
+                        retry202: Boolean = true, contentType: String? = null, data: List<Pair<String, String>>? = null): String {
         if (api !is SpotifyClientAPI && System.currentTimeMillis() >= api.expireTime) {
             api.refreshClient()
             api.expireTime = System.currentTimeMillis() + api.token.expires_in * 1000
         }
         var connection = Jsoup.connect(url).ignoreContentType(true)
+        if (data != null) data.forEach { connection.data(it.first, it.second) }
         if (contentType != null) connection.header("Content-Type", contentType)
         if (body != null) {
             if (contentType != null) connection.requestBody(body)
diff --git a/src/test/kotlin/com/adamratzman/spotify/endpoints/priv/follow/ClientFollowAPITest.kt b/src/test/kotlin/com/adamratzman/spotify/endpoints/priv/follow/ClientFollowAPITest.kt
@@ -0,0 +1,62 @@
+package com.adamratzman.spotify.kotlin.endpoints.priv.follow
+
+import clientApi
+import org.junit.Test
+
+class ClientFollowAPITest {
+    @Test
+    fun isFollowingUser() {
+        clientApi.clientFollowing.isFollowingUser("asdfasdfasdfsfasdfasdf").complete().let { println(it) }
+    }
+
+    @Test
+    fun isFollowingArtist() {
+        println(clientApi.clientFollowing.isFollowingArtist("4IS4EyXNmiI2w5SRCjMtEF").complete())
+    }
+
+    @Test
+    fun followingUsers() {
+        println(clientApi.clientFollowing.isFollowingUsers("adamratzman").complete())
+    }
+
+    @Test
+    fun getFollowedArtists() {
+        println(clientApi.clientFollowing.getFollowedArtists().complete())
+    }
+
+    @Test
+    fun followingArtists() {
+        println(clientApi.clientFollowing.isFollowingArtists("7wjeXCtRND2ZdKfMJFu6JC").complete())
+    }
+
+    @Test
+    fun followUsers() {
+        println(clientApi.clientFollowing.followUsers("adamratzman").complete())
+    }
+
+    @Test
+    fun followArtists() {
+        println(clientApi.clientFollowing.followArtists("6rfl53MP8HSoiugpqzA50Zh").complete())
+    }
+
+    @Test
+    fun followPlaylist() {
+        println(clientApi.clientFollowing.followPlaylist("digster.fr", "495KyiFkFAlBdD98jvw7fh").complete())
+    }
+
+    @Test
+    fun unfollowUsers() {
+        println(clientApi.clientFollowing.unfollowUsers("adamratzman").complete())
+    }
+
+    @Test
+    fun unfollowArtists() {
+        println(clientApi.clientFollowing.unfollowArtists("6rl53MP8HSoiugpqzA50Zh").complete())
+    }
+
+    @Test
+    fun unfollowPlaylist() {
+        println(clientApi.clientFollowing.unfollowPlaylist("digster.fr", "495KyiFkFAlBdD98jvw7fh").complete())
+    }
+
+}
diff --git a/src/test/kotlin/com/adamratzman/spotify/endpoints/priv/follow/UserFollowAPITest.kt b/src/test/kotlin/com/adamratzman/spotify/endpoints/priv/follow/UserFollowAPITest.kt
diff --git a/src/test/kotlin/com/adamratzman/spotify/endpoints/priv/playlists/ClientPlaylistAPITest.kt b/src/test/kotlin/com/adamratzman/spotify/endpoints/priv/playlists/ClientPlaylistAPITest.kt
@@ -3,7 +3,7 @@ package com.adamratzman.spotify.endpoints.priv.playlists
 import clientApi
 import org.junit.Test
 
-internal class UserPlaylistAPITest {
+internal class ClientPlaylistAPITest {
     @Test
     fun createPlaylist() {
     }
@@ -32,7 +32,17 @@ internal class UserPlaylistAPITest {
     fun uploadPlaylistCover() {
         println(clientApi.token.access_token)
         println(clientApi.playlists.getPlaylist("adamratzman1", "24LoWIwSxOTzaq44qLabiV").complete().name)
-        clientApi.userPlaylists.uploadPlaylistCover("adamratzman1", "24LoWIwSxOTzaq44qLabiV",
+        clientApi.clientPlaylists.uploadPlaylistCover("adamratzman1", "24LoWIwSxOTzaq44qLabiV",
                 imageUrl = "https://upload.wikimedia.org/wikipedia/commons/3/3a/Cat03.jpg").complete()
     }
+
+    @Test
+    fun removeAllOccurances() {
+        clientApi.clientPlaylists.addTracksToPlaylist("adamratzman1", "53Sr94VRrDgvLCh86lbMVx", "3ghmFXEXTP6DdVOyvuPHpr")
+                .complete()
+        clientApi.playlists.getPlaylist("adamratzman1", "53Sr94VRrDgvLCh86lbMVx").complete()
+                .tracks.items.map { it.track.id }.let { println(it) }
+        clientApi.clientPlaylists.removeAllOccurances("adamratzman1", "53Sr94VRrDgvLCh86lbMVx",
+                "3ghmFXEXTP6DdVOyvuPHpr").complete()
+    }
 }
diff --git a/src/test/kotlin/com/adamratzman/spotify/endpoints/priv/users/ClientProfileAPITest.kt b/src/test/kotlin/com/adamratzman/spotify/endpoints/priv/users/ClientProfileAPITest.kt
@@ -4,10 +4,10 @@ import clientApi
 import org.junit.Test
 
 
-internal class UserAPITest {
+internal class ClientProfileAPITest {
     @Test
     fun getUserProfile() {
-        println(clientApi.userProfile.getUserProfile().complete())
+        println(clientApi.clientProfile.getUserProfile().complete())
     }
 
 }
diff --git a/src/test/kotlin/com/adamratzman/spotify/endpoints/pub/follow/PublicClientFollowAPITest.kt b/src/test/kotlin/com/adamratzman/spotify/endpoints/pub/follow/PublicClientFollowAPITest.kt
@@ -3,7 +3,7 @@ package com.adamratzman.spotify.kotlin.endpoints.pub.follow
 import api
 import org.junit.Test
 
-class PublicUserFollowAPITest {
+class PublicClientFollowAPITest {
     @Test
     fun doUsersFollowPlaylist() {
         println(api.publicFollowing.doUsersFollowPlaylist("jmperezperez", "3cEYpjA9oz9GiPac4AsH4n", "jmperezperez", "elogasdfjjadsfain").complete())

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import java.util.function.Supplier`
`7`	`7`	`/**`
`8`	`8`	`* These endpoints allow you manage the artists, users and playlists that a Spotify user follows.`
`9`	`9`	`*/`
`10`		`-class UserFollowAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {`
	`10`	`+class ClientFollowAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {`
`11`	`11`	`/**`
`12`	`12`	`* Check to see if the current user is following another Spotify users.`
`13`	`13`	`*`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import java.util.function.Supplier`
`8`	`8`	`/**`
`9`	`9`	`* Endpoints for retrieving information about, and managing, tracks that the current user has saved in their “Your Music” library.`
`10`	`10`	`*/`
`11`		`-class UserLibraryAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {`
	`11`	`+class ClientLibraryAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {`
`12`	`12`	`/**`
`13`	`13`	`* Get a list of the songs saved in the current Spotify user’s ‘Your Music’ library.`
`14`	`14`	`*`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import java.util.function.Supplier`
`10`	`10`	`/**`
`11`	`11`	`* Endpoints for retrieving information about a user’s profile.`
`12`	`12`	`*/`
`13`		`-class UserAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {`
	`13`	`+class ClientProfileAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {`
`14`	`14`	`/**`
`15`	`15`	`* Get detailed profile information about the current user (including the current user’s username).`
`16`	`16`	`*`