add builder, some following tests

Author: adamint

.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_0.xml

@@ -77,7 +77,7 @@ class ClientFollowingAPI(api: SpotifyAPI) : FollowingAPI(api) {
         })
     }
 
-    fun getFollowedUsers(): SpotifyRestAction<SpotifyPublicUser> = throw NotImplementedError("Though Spotify will implement this in the future, it is not currently supported.")
+    fun getFollowedUsers(): SpotifyRestAction<List<SpotifyPublicUser>> = throw NotImplementedError("Though Spotify will implement this in the future, it is not currently supported.")
 
     /**
      * Add the current user as a follower of another user

.idea/libraries/Gradle__org_spekframework_spek2_spek_runtime_common_2_0_0_alpha_1.xml

@@ -10,7 +10,7 @@ import java.util.function.Supplier
  * These endpoints allow for viewing and controlling user playback. Please view [the official documentation](https://developer.spotify.com/web-api/working-with-connect/)
  * for more information on how this works. This is in beta and is available for **premium users only**. Endpoints are **not** guaranteed to work
  */
-class PlayerAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
+class ClientPlayerAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
     fun getDevices(): SpotifyRestAction<List<Device>> {
         return toAction(Supplier {
             get(EndpointBuilder("/me/player/devices").toString()).toInnerObject<Device>("devices", api)

src/main/kotlin/com/adamratzman/spotify/endpoints/client/ClientFollowingAPI.kt

@@ -70,12 +70,12 @@ class SpotifyApiBuilderJava(val clientId: String, val clientSecret: String) {
  * @property redirectUri nullable redirect uri (use if you're doing client authentication
  */
 class SpotifyCredentialsBuilder {
-    var clientId: String = ""
-    var clientSecret: String = ""
+    var clientId: String?=null
+    var clientSecret: String?=null
     var redirectUri: String? = null
 
     fun build() =
-            if (clientId.isEmpty() || clientSecret.isEmpty()) throw IllegalArgumentException("clientId or clientSecret is empty")
+            if (clientId?.isNotEmpty() == false || clientSecret?.isNotEmpty() == false) throw IllegalArgumentException("clientId or clientSecret is empty")
             else SpotifyCredentials(clientId, clientSecret, redirectUri)
 }
 
@@ -121,8 +121,6 @@ class SpotifyApiBuilder {
         }
     }
 
-    // TODO look into whether Client should be renamed to User
-
     fun buildClient(automaticRefresh: Boolean = false): SpotifyClientAPI =
             buildClient(clientAuthentication.authorizationCode, clientAuthentication.tokenString,
                     clientAuthentication.token, automaticRefresh)
@@ -218,15 +216,14 @@ class SpotifyClientAPI internal constructor(clientId: String, clientSecret: Stri
     override val tracks: TracksAPI = TracksAPI(this)
     override val following: ClientFollowingAPI = ClientFollowingAPI(this)
     val personalization: ClientPersonalizationAPI = ClientPersonalizationAPI(this)
-    val clientProfile: ClientUserAPI = ClientUserAPI(this)
     val library: ClientLibraryAPI = ClientLibraryAPI(this)
-    val player: PlayerAPI = PlayerAPI(this)
+    val player: ClientPlayerAPI = ClientPlayerAPI(this)
 
     val userId: String
 
     init {
         init(automaticRefresh)
-        userId = clientProfile.getUserProfile().complete().id
+        userId = users.getUserProfile().complete().id
     }
 
     private fun init(automaticRefresh: Boolean) {

…an/spotify/endpoints/client/PlayerAPI.kt …tify/endpoints/client/ClientPlayerAPI.ktsrc/main/kotlin/com/adamratzman/spotify/endpoints/client/PlayerAPI.kt renamed to src/main/kotlin/com/adamratzman/spotify/endpoints/client/ClientPlayerAPI.kt src/main/kotlin/com/adamratzman/spotify/endpoints/client/PlayerAPI.kt renamed to src/main/kotlin/com/adamratzman/spotify/endpoints/client/ClientPlayerAPI.kt

@@ -53,7 +53,7 @@ abstract class SpotifyEndpoint(val api: SpotifyAPI) {
     fun <T> toAction(supplier: Supplier<T>) = SpotifyRestAction(api, supplier)
 }
 
-internal class EndpointBuilder(val path: String) {
+internal class EndpointBuilder(private val path: String) {
     private val builder = StringBuilder(base + path)
 
     fun with(key: String, value: Any?): EndpointBuilder {

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

@@ -1,3 +1,5 @@
+@file:Suppress("UNCHECKED_CAST")
+
 package com.adamratzman.spotify.utils
 
 import com.adamratzman.spotify.main.SpotifyAPI
@@ -17,11 +19,29 @@ data class CursorBasedPagingObject<out T>(val href: String, val items: List<T>,
                     next?.let { endpoint.get(it).toCursorBasedPagingObject<T>(endpoint = endpoint) }
                 }
             })
+
+    inline fun <reified T> getAll(): SpotifyRestAction<List<CursorBasedPagingObject<T>>> {
+       return  endpoint.toAction(Supplier {
+           this as CursorBasedPagingObject<T>
+           val pagingObjects = mutableListOf<CursorBasedPagingObject<T>>(this)
+           var next = getNext<T>().complete()
+           while (next != null) {
+               pagingObjects.add(next)
+               next = getNext<T>().complete()
+           }
+           pagingObjects.toList()
+       })
+    }
+
+    inline fun <reified T> getAllItems(): SpotifyRestAction<List<T>> {
+        return endpoint.toAction(Supplier {
+            getAll<T>().complete().map { it.items }.flatten()
+        })
+    }
 }
 
 data class Cursor(val after: String)
 
-@Suppress("UNCHECKED_CAST")
 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, var endpoint: SpotifyEndpoint) {
     inline fun <reified T> getNext(): SpotifyRestAction<PagingObject<T>?> = endpoint.toAction(
@@ -61,6 +81,12 @@ data class PagingObject<out T>(val href: String, val items: List<T>, val limit:
                     pagingObjects.map { it.items }.flatten()
                 })
     }
+
+    inline fun <reified T> getAllItems(): SpotifyRestAction<List<T>> {
+        return endpoint.toAction(Supplier {
+            getAll<T>().complete().asSequence().map { it as PagingObject<T> }.map { it.items }.toList().flatten()
+        })
+    }
 }
 
 data class LinkedResult<out T>(val href: String, val items: List<T>) {

src/main/kotlin/com/adamratzman/spotify/utils/Endpoints.kt

@@ -19,7 +19,7 @@ val api = when {
                 redirectUri = System.getProperty("spotifyRedirectUri")
             }
             clientAuthentication {
-                authorizationCode = System.getProperty("spotifyAuthCode")
+                tokenString = System.getProperty("spotifyTokenString")
             }
         }.buildClient()
     }

src/main/kotlin/com/adamratzman/spotify/utils/Helpers.kt

@@ -0,0 +1,46 @@
+package com.adamratzman.spotify.private
+
+import com.adamratzman.spotify.api
+import com.adamratzman.spotify.main.SpotifyClientAPI
+import com.adamratzman.spotify.utils.Artist
+import com.adamratzman.spotify.utils.BadRequestException
+import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.assertThrows
+import org.spekframework.spek2.Spek
+import org.spekframework.spek2.style.specification.describe
+
+class ClientFollowingAPITest : Spek({
+    describe("Client following tests") {
+        if (api !is SpotifyClientAPI) return@describe
+        it("following/unfollowing artists") {
+            val testArtistId = "7eCmccnRwPmRnWPw61x6jM"
+
+            if (api.following.isFollowingArtist(testArtistId).complete()) {
+                api.following.unfollowArtist(testArtistId).complete()
+            }
+
+            assert(!api.following.isFollowingArtist(testArtistId).complete())
+
+            val beforeFollowing = api.following.getFollowedArtists().complete().getAllItems<Artist>().complete()
+
+            assertNull(beforeFollowing.find { it.id == testArtistId })
+
+            api.following.followArtist(testArtistId).complete()
+
+            assert(api.following.isFollowingArtist(testArtistId).complete())
+
+            assertEquals(1, api.following.getFollowedArtists().complete().getAllItems<Artist>().complete().size - beforeFollowing.size)
+
+            api.following.unfollowArtist(testArtistId).complete()
+
+            assert(beforeFollowing.size == api.following.getFollowedArtists().complete().getAllItems<Artist>().complete().size)
+
+            assert(!api.following.isFollowingArtist(testArtistId).complete())
+
+            assertThrows<BadRequestException> { api.following.isFollowingArtist("no u").complete() }
+            assertThrows<BadRequestException> { api.following.followArtist("no u").complete() }
+            assertThrows<BadRequestException> { api.following.followArtists(testArtistId,"no u").complete() }
+            assertThrows<BadRequestException> { api.following.unfollowArtist("no u").complete() }
+        }
+    }
+})

src/test/kotlin/com/adamratzman/spotify/Common.kt

@@ -0,0 +1,7 @@
+package com.adamratzman.spotify.private
+
+import org.spekframework.spek2.Spek
+
+class ClientLibraryAPITest: Spek({
+
+})