404 should be ignored in catch(() -> T) too

Author: adamint

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

@@ -39,7 +39,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", api
+                    "devices"
             )
         })
     }

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

@@ -117,7 +117,7 @@ class ArtistsAPI(api: SpotifyAPI) : SpotifyEndpoint(api) {
                             "country",
                             market.name
                     ).toString()
-            ).toInnerArray<Track>("tracks", api)
+            ).toInnerArray<Track>("tracks")
         })
     }
 

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

@@ -41,8 +41,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",
-                    api
+                    "genres"
             )
         })
     }

src/main/kotlin/com/adamratzman/spotify/models/Users.kt

@@ -72,5 +72,5 @@ data class SpotifyPublicUser(
 data class Followers(
     val href: String?,
     @Json(name = "total") private val _total: Int,
-    @Transient val total: Int = _total ?: -1
+    @Transient val total: Int = _total
 )

src/main/kotlin/com/adamratzman/spotify/models/serialization/SerializationUtils.kt

@@ -126,22 +126,22 @@ internal inline fun <reified T> String.toCursorBasedPagingObject(
     }
 }
 
-internal inline fun <reified T> String.toInnerObject(innerName: String, api: SpotifyAPI): T {
+internal inline fun <reified T> String.toInnerObject(innerName: String): T {
     val map = fromJsonMap<String, T>(
             String::class.java,
             T::class.java,
             this)!!
 
-    return map[innerName]!!
+    return map[innerName] ?: error("Inner object with name $innerName doesn't exist in $map")
 }
 
-internal inline fun <reified T> String.toInnerArray(innerName: String, api: SpotifyAPI): List<T> {
+internal inline fun <reified T> String.toInnerArray(innerName: String): List<T> {
     val map = fromJsonMap<String, Array<T>>(
             String::class.java,
             Array<T>::class.java,
             this)!!
 
-    return map[innerName]!!.toList()
+    return (map[innerName] ?: error("Inner object with name $innerName doesn't exist in $map")).toList()
 }
 
 private fun <K, V> fromJsonMap(keyType: Type, valueType: Type, json: String): Map<K, V>? {

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

@@ -10,7 +10,8 @@ internal fun <T> catch(function: () -> T): T? {
     return try {
         function()
     } catch (e: BadRequestException) {
-        if (e.statusCode != 400) throw e // we should only ignore the exception if it's a bad request (400)
+        if (e.statusCode !in listOf(400, 404)) throw e
+        // we should only ignore the exception if it's 400 or 404. Otherwise, it's a larger issue
         null
     }
 }

src/test/kotlin/com/adamratzman/spotify/utilities/HttpConnectionTests.kt

@@ -80,7 +80,7 @@ class HttpConnectionTests : Spek({
         }
 
         describe("delete request") {
-            val (response, body) = HttpConnection(
+            val (response, _) = HttpConnection(
                     "https://httpbin.org/delete?query=string",
                     HttpRequestMethod.DELETE,
                     null,