Merge pull request #119 from adamint/dev

update search endpoint, fix isTokenValid logic

Author: adamint

README.md

@@ -28,7 +28,7 @@ repositories {
     jcenter()
 }
 
-compile group: 'com.adamratzman', name: 'spotify-api-kotlin', version: '2.3.06'
+compile group: 'com.adamratzman', name: 'spotify-api-kotlin', version: '2.3.08'
 ```
 
 To use the latest snapshot instead, you must add the Jitpack repository as well
@@ -50,7 +50,7 @@ dependencies {
 <dependency>
     <groupId>com.adamratzman</groupId>
     <artifactId>spotify-api-kotlin</artifactId>
-    <version>2.3.06</version>
+    <version>2.3.08</version>
 </dependency>
 
 <repository>

build.gradle

@@ -22,7 +22,7 @@ apply plugin: 'kotlin'
 apply plugin: 'org.jetbrains.dokka'
 
 group 'com.adamratzman'
-version '2.3.06'
+version '2.3.08'
 
 archivesBaseName = 'spotify-api-kotlin'
 
@@ -36,6 +36,7 @@ dependencies {
 
     compile "com.squareup.moshi:moshi:1.8.0"
     compile "com.squareup.moshi:moshi-kotlin:1.8.0"
+    compile group: 'org.json', name: 'json', version: '20190722'
 
     compile "com.google.http-client:google-http-client:1.31.0"
 

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
@@ -171,7 +171,7 @@ abstract class SpotifyAPI internal constructor(
      * @return [TokenValidityResponse] containing whether this token is valid, and if not, an Exception explaining why
      */
     fun isTokenValid(makeTestRequest: Boolean = true): TokenValidityResponse {
-        if (!token.shouldRefresh()) return TokenValidityResponse(false, SpotifyException("Token expired"))
+        if (token.shouldRefresh()) return TokenValidityResponse(false, SpotifyException("Token needs to be refreshed (is it expired?)"))
         if (!makeTestRequest) return TokenValidityResponse(true, null)
 
         return try {

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

@@ -14,7 +14,7 @@ import com.adamratzman.spotify.models.ArtistURI
 import com.adamratzman.spotify.models.CursorBasedPagingObject
 import com.adamratzman.spotify.models.PlaylistURI
 import com.adamratzman.spotify.models.UserURI
-import com.adamratzman.spotify.models.serialization.toArray
+import com.adamratzman.spotify.models.serialization.toList
 import com.adamratzman.spotify.models.serialization.toCursorBasedPagingObject
 import java.util.function.Supplier
 
@@ -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)
+            ).toList<Boolean>(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)
+            ).toList<Boolean>(api)
         })
     }
 

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

@@ -13,7 +13,7 @@ import com.adamratzman.spotify.models.PagingObject
 import com.adamratzman.spotify.models.SavedAlbum
 import com.adamratzman.spotify.models.SavedTrack
 import com.adamratzman.spotify.models.TrackURI
-import com.adamratzman.spotify.models.serialization.toArray
+import com.adamratzman.spotify.models.serialization.toList
 import com.adamratzman.spotify.models.serialization.toPagingObject
 import com.neovisionaries.i18n.CountryCode
 import java.util.function.Supplier
@@ -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)
+            ).toList<Boolean>(api)
         })
     }
 

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

@@ -57,8 +57,7 @@ class ClientPersonalizationAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
             get(
                     EndpointBuilder("/me/top/artists").with("limit", limit).with("offset", offset)
                             .with("time_range", timeRange).toString()
-            )
-                    .toPagingObject<Artist>(endpoint = this)
+            ).toPagingObject<Artist>(endpoint = this)
         })
     }
 
@@ -90,8 +89,7 @@ class ClientPersonalizationAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
             get(
                     EndpointBuilder("/me/top/tracks").with("limit", limit).with("offset", offset)
                             .with("time_range", timeRange).toString()
-            )
-                    .toPagingObject<Track>(endpoint = this)
+            ).toPagingObject<Track>(endpoint = this)
         })
     }
 }

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

@@ -38,9 +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>>(
-                    "devices"
-            )
+            get(EndpointBuilder("/me/player/devices").toString()).toInnerObject<List<Device>>("devices")
         })
     }
 
@@ -78,9 +76,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>(
-                    endpoint = this
-            )
+            ).toCursorBasedPagingObject<PlayHistory>(endpoint = this)
         })
     }
 

src/main/kotlin/com/adamratzman/spotify/endpoints/public/AlbumAPI.kt

@@ -34,8 +34,7 @@ class AlbumAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
     fun getAlbum(album: String, market: CountryCode? = null): SpotifyRestAction<Album?> {
         return toAction(Supplier {
             catch {
-                get(EndpointBuilder("/albums/${AlbumURI(album).id}").with("market", market?.name).toString())
-                        .toObject<Album>(api)
+                get(EndpointBuilder("/albums/${AlbumURI(album).id}").with("market", market?.name).toString()).toObject<Album>(api)
             }
         })
     }

src/main/kotlin/com/adamratzman/spotify/endpoints/public/ArtistsAPI.kt

@@ -36,8 +36,7 @@ class ArtistsAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
     fun getArtist(artist: String): SpotifyRestAction<Artist?> {
         return toAction(Supplier {
             catch {
-                get(EndpointBuilder("/artists/${ArtistURI(artist).id.encode()}").toString())
-                        .toObject<Artist>(api)
+                get(EndpointBuilder("/artists/${ArtistURI(artist).id.encode()}").toString()).toObject<Artist>(api)
             }
         })
     }

src/main/kotlin/com/adamratzman/spotify/endpoints/public/BrowseAPI.kt

@@ -39,9 +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>(
-                    "genres"
-            )
+            get(EndpointBuilder("/recommendations/available-genre-seeds").toString()).toInnerArray<String>("genres")
         })
     }
 
@@ -67,9 +65,7 @@ class BrowseAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
                             "country",
                             market?.name
                     ).toString()
-            ).toPagingObject<SimpleAlbum>(
-                    "albums", endpoint = this
-            )
+            ).toPagingObject<SimpleAlbum>("albums", endpoint = this)
         })
     }
 
@@ -138,9 +134,7 @@ class BrowseAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
                             "market",
                             market?.name
                     ).with("locale", locale).toString()
-            ).toPagingObject<SpotifyCategory>(
-                    "categories", endpoint = this
-            )
+            ).toPagingObject<SpotifyCategory>("categories", endpoint = this)
         })
     }
 
@@ -301,9 +295,9 @@ 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) }
+            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)
         })
     }