handle bad request

build.gradle

@@ -1,7 +1,7 @@
 plugins {
-    id 'org.jetbrains.kotlin.jvm' version '1.4.20'
+    id 'org.jetbrains.kotlin.jvm' version '1.4.30'
     id "com.github.ben-manes.versions" version "0.36.0"
-    id 'org.springframework.boot' version '2.4.0'
+    id 'org.springframework.boot' version '2.4.2'
 }
 
 ext {
@@ -40,8 +40,8 @@ dependencies {
     compile 'com.apurebase:arkenv:3.1.0'
     compile 'org.apache.commons:commons-text:1.9'
 
-    testImplementation "io.strikt:strikt-core:0.28.1"
-    testImplementation "io.mockk:mockk:1.10.3"
+    testImplementation "io.strikt:strikt-core:0.28.2"
+    testImplementation "io.mockk:mockk:1.10.6"
     testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: junit_version
     testRuntime "org.junit.jupiter:junit-jupiter-engine:$junit_version"
 }
@@ -58,9 +58,8 @@ test {
 }
 
 compileKotlin {
-    kotlinOptions.jvmTarget = "1.8"
+    kotlinOptions.jvmTarget = "11"
     kotlinOptions.useIR = true
-
 }
 compileTestKotlin {
     kotlinOptions.jvmTarget = "13"

src/main/kotlin/me/avo/spottit/data/TrackResult.kt

@@ -0,0 +1,16 @@
+package me.avo.spottit.data
+
+import com.wrapper.spotify.model_objects.specification.Track
+import me.avo.spottit.model.RedditTrack
+
+/**
+ * Result of the find track operation.
+ * @param redditTrack the reddit track to look for.
+ * @param chosenTrack the chosen track.
+ * @param totalNumberResults the total number of results found.
+ */
+data class TrackResult(
+    val redditTrack: RedditTrack,
+    val chosenTrack: Track?,
+    val totalNumberResults: Int,
+)

src/main/kotlin/me/avo/spottit/service/spotify/ElectronicSearchAlgorithm.kt

@@ -1,6 +1,7 @@
 package me.avo.spottit.service.spotify
 
 import com.wrapper.spotify.model_objects.specification.Track
+import me.avo.spottit.data.TrackResult
 import me.avo.spottit.model.RedditTrack
 import me.avo.spottit.util.SpotifyQueryTools
 import me.avo.spottit.util.TrackFilter
@@ -13,26 +14,33 @@ class ElectronicSearchAlgorithm(
 
     override fun searchForTracks(tracks: List<RedditTrack>): List<Track> = tracks
         .asSequence()
-        .map(::findTrack)
+        .map(::tryFindTrack)
         .mapNotNull { (reddit, chosenTrack, total) ->
             logger.info("Found $total results for: $reddit | ${chosenTrack?.artists?.joinToString { it.name }} - ${chosenTrack?.name}")
             chosenTrack
         }
         .onEach { trackFilter.timeout() }
         .toList()
 
-    private fun findTrack(track: RedditTrack): Triple<RedditTrack, Track?, Int> = when {
+    private fun tryFindTrack(track: RedditTrack): TrackResult = try {
+        findTrack(track)
+    } catch (ex: Exception) {
+        logger.warn("Exception finding track $track", ex)
+        TrackResult(track, null, 0)
+    }
+
+    private fun findTrack(track: RedditTrack): TrackResult = when {
         track.isSpotifyTrack -> getTrack(track)
         else -> searchForTrack(track)
     }
 
-    private fun getTrack(track: RedditTrack): Triple<RedditTrack, Track?, Int> {
+    private fun getTrack(track: RedditTrack): TrackResult {
         val id = track.url!!.toString().substringAfter("/track/").substringBefore("?")
         val spotifyTrack = spotifyApi.getTrack(id)
-        return Triple(track, spotifyTrack, if (spotifyTrack != null) 1 else 0)
+        return TrackResult(track, spotifyTrack, if (spotifyTrack != null) 1 else 0)
     }
 
-    private fun searchForTrack(track: RedditTrack): Triple<RedditTrack, Track?, Int> =
+    private fun searchForTrack(track: RedditTrack): TrackResult =
         SpotifyQueryTools.initialQuery(track, useTags = true)
             .let(::searchQuery)
             .let { (total, items) ->
@@ -42,7 +50,7 @@ class ElectronicSearchAlgorithm(
                         if (trackFilter.checkTrackAgeByAlbum(album)) it else null
                     } else it
                 }
-                Triple(track, chosenTrack, total)
+                TrackResult(track, chosenTrack, total)
             }
 
     private fun searchQuery(query: String): Pair<Int, Array<Track>> {

src/main/kotlin/me/avo/spottit/service/spotify/SpotifyApiServiceImpl.kt

@@ -4,14 +4,10 @@ import com.github.salomonbrys.kotson.jsonArray
 import com.github.salomonbrys.kotson.jsonObject
 import com.github.salomonbrys.kotson.toJsonArray
 import com.wrapper.spotify.SpotifyApi
-import com.wrapper.spotify.exceptions.detailed.BadGatewayException
-import com.wrapper.spotify.exceptions.detailed.NotFoundException
-import com.wrapper.spotify.exceptions.detailed.ServiceUnavailableException
-import com.wrapper.spotify.exceptions.detailed.TooManyRequestsException
+import com.wrapper.spotify.exceptions.detailed.*
 import com.wrapper.spotify.model_objects.special.SnapshotResult
 import com.wrapper.spotify.model_objects.specification.Album
 import com.wrapper.spotify.model_objects.specification.Paging
-import com.wrapper.spotify.model_objects.specification.PlaylistTrack
 import com.wrapper.spotify.model_objects.specification.Track
 import me.avo.spottit.model.TrackInPlaylist
 import me.avo.spottit.util.RetrySupport
@@ -24,6 +20,8 @@ class SpotifyApiServiceImpl(private val spotifyApi: SpotifyApi) : SpotifyApiServ
         spotifyApi.getTrack(id).execute()
     } catch (ex: NotFoundException) {
         null
+    } catch (ex: BadRequestException) {
+        null
     }
 
     override fun getAlbum(id: String): Album = spotifyApi.getAlbum(id).execute()

src/main/kotlin/me/avo/spottit/util/RetrySupport.kt

@@ -1,5 +1,6 @@
 package me.avo.spottit.util
 
+import com.wrapper.spotify.exceptions.detailed.BadRequestException
 import com.wrapper.spotify.exceptions.detailed.NotFoundException
 import com.wrapper.spotify.requests.IRequest
 import org.slf4j.Logger
@@ -26,7 +27,7 @@ inline fun <T> RetrySupport.retry(block: () -> T): T {
         return block()
     }
     catch (ex: Exception) {
-        if (ex is NotFoundException) {
+        if (ex is NotFoundException || ex is BadRequestException) {
             throw ex // should be handled by call site
         }
         logger.error("Exception encountered in retry code.", ex)