get [track, album, playlist] is now nullable

Author: adamint

README.md

@@ -15,7 +15,7 @@ This library is available via Maven Central.
 <dependency>
     <groupId>com.adamratzman</groupId>
     <artifactId>spotify-api-kotlin</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
 </dependency>
 ```
 

build.gradle

@@ -1,5 +1,5 @@
 group 'com.adamratzman'
-version '1.0.1'
+version '1.0.2'
 
 buildscript {
     ext.kotlin_version = '1.2.31'

src/main/kotlin/com/adamratzman/spotify/endpoints/pub/album/AlbumAPI.kt

@@ -16,9 +16,9 @@ class AlbumAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
      *
      * @throws BadRequestException if the [albumId] is not found
      */
-    fun getAlbum(albumId: String, market: Market? = null): SpotifyRestAction<Album> {
+    fun getAlbum(albumId: String, market: Market? = null): SpotifyRestAction<Album?> {
         return toAction(Supplier {
-            get("https://api.spotify.com/v1/albums/$albumId${if (market != null) "?market=${market.code}" else ""}").toObject<Album>(api)
+            catch { get("https://api.spotify.com/v1/albums/$albumId${if (market != null) "?market=${market.code}" else ""}").toObject<Album>(api) }
         })
     }
 

src/main/kotlin/com/adamratzman/spotify/endpoints/pub/playlists/PlaylistsAPI.kt

@@ -34,9 +34,9 @@ class PlaylistsAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
      *
      * @throws BadRequestException if the playlist is not found
      */
-    fun getPlaylist(userId: String, playlistId: String, market: Market? = null): SpotifyRestAction<Playlist> {
+    fun getPlaylist(userId: String, playlistId: String, market: Market? = null): SpotifyRestAction<Playlist?> {
         return toAction(Supplier {
-            get("https://api.spotify.com/v1/users/${userId.encode()}/playlists/${playlistId.encode()}${if (market != null) "?market=${market.code}" else ""}").toObject<Playlist>(api)
+            catch {get ("https://api.spotify.com/v1/users/${userId.encode()}/playlists/${playlistId.encode()}${if (market != null) "?market=${market.code}" else ""}").toObject<Playlist>(api)}
         })
     }
 

src/main/kotlin/com/adamratzman/spotify/endpoints/pub/tracks/TracksAPI.kt

@@ -17,9 +17,9 @@ class TracksAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
      *
      * @throws BadRequestException if [trackId] cannot be found
      */
-    fun getTrack(trackId: String, market: Market? = null): SpotifyRestAction<Track> {
+    fun getTrack(trackId: String, market: Market? = null): SpotifyRestAction<Track?> {
         return toAction(Supplier {
-            get("https://api.spotify.com/v1/tracks/${trackId.encode()}${if (market != null) "?market=${market.code}" else ""}").toObject<Track>(api)
+            catch { get("https://api.spotify.com/v1/tracks/${trackId.encode()}${if (market != null) "?market=${market.code}" else ""}").toObject<Track>(api) }
         })
     }
 

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

@@ -137,4 +137,12 @@ inline fun <reified T> String.toLinkedResult(api: SpotifyAPI): LinkedResult<T> {
 
 inline fun <reified T> String.toInnerObject(innerName: String, api: SpotifyAPI): List<T> {
     return JSONObject(this).getJSONArray(innerName).map { it.toString().toObject<T>(api) }
+}
+
+fun <T> catch(function: () -> T):T? {
+    return try{
+       function()
+    } catch (e:BadRequestException) {
+        null
+    }
 }

src/test/kotlin/com/adamratzman/spotify/endpoints/priv/playlists/ClientPlaylistAPITest.kt

@@ -31,7 +31,7 @@ internal class ClientPlaylistAPITest {
     @Test
     fun uploadPlaylistCover() {
         println(clientApi.token.access_token)
-        println(clientApi.playlists.getPlaylist("adamratzman1", "24LoWIwSxOTzaq44qLabiV").complete().name)
+        println(clientApi.playlists.getPlaylist("adamratzman1", "24LoWIwSxOTzaq44qLabiV").complete()?.name)
         clientApi.clientPlaylists.uploadPlaylistCover("adamratzman1", "24LoWIwSxOTzaq44qLabiV",
                 imageUrl = "https://upload.wikimedia.org/wikipedia/commons/3/3a/Cat03.jpg").complete()
     }
@@ -41,7 +41,7 @@ internal class ClientPlaylistAPITest {
         clientApi.clientPlaylists.addTracksToPlaylist("adamratzman1", "53Sr94VRrDgvLCh86lbMVx", "3ghmFXEXTP6DdVOyvuPHpr")
                 .complete()
         clientApi.playlists.getPlaylist("adamratzman1", "53Sr94VRrDgvLCh86lbMVx").complete()
-                .tracks.items.map { it.track.id }.let { println(it) }
+                ?.tracks?.items?.map { it.track.id }.let { println(it) }
         //clientApi.clientPlaylists.removeAllOccurances("adamratzman1", "53Sr94VRrDgvLCh86lbMVx",
           //      "3ghmFXEXTP6DdVOyvuPHpr").complete()
     }

src/test/kotlin/com/adamratzman/spotify/endpoints/pub/playlists/PlaylistsAPITest.kt

@@ -11,7 +11,7 @@ internal class PlaylistsAPITest {
 
     @Test
     fun getPlaylist() {
-        println(api.playlists.getPlaylist("spotify", "59ZbFPES4DQwEjBpWHzrtC").complete())
+        println(api.playlists.getPlaylist("spotify", "5dsaf9ZbFPES4DQwEjBpWHzrtC").complete())
     }
 
     @Test