fix: throw Exception on all 4xx and 5xx status codes (#418)

julius-d · dargmuesli · web-flow · commit 7f0aa3e55ee7 · 2025-07-23T08:59:09.000+02:00
* fix: throw Exception on all 4xx and 5xx status codes

I had a temporary bug in my usage of this nice lib that
is likely caused by Spotify replying with a 4xx or 5xx
status code that was handled by the lib as 2xx status code.

* chore: format

---------

Co-authored-by: Jonas Thelemann &lt;e-mail@jonas-thelemann.de&gt;
diff --git a/src/main/java/se/michaelthelin/spotify/SpotifyHttpManager.java b/src/main/java/se/michaelthelin/spotify/SpotifyHttpManager.java
@@ -350,6 +350,11 @@ private String getResponseBody(CloseableHttpResponse httpResponse) throws
       case HttpStatus.SC_SERVICE_UNAVAILABLE:
         throw new ServiceUnavailableException(errorMessage);
       default:
+        if (httpResponse.getCode() >= 400 && httpResponse.getCode() < 500) {
+          throw new BadRequestException(errorMessage);
+        } else if (httpResponse.getCode() >= 500) {
+          throw new InternalServerErrorException(errorMessage);
+        }
         return responseBody;
     }
   }
diff --git a/src/test/java/se/michaelthelin/spotify/SpotifyHttpManagerTest.java b/src/test/java/se/michaelthelin/spotify/SpotifyHttpManagerTest.java
@@ -0,0 +1,45 @@
+package se.michaelthelin.spotify;
+
+import com.github.tomakehurst.wiremock.junit5.WireMockTest;
+import org.apache.hc.core5.http.Header;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import se.michaelthelin.spotify.SpotifyHttpManager.Builder;
+import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
+
+import java.net.URI;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+
+@WireMockTest(httpPort = 9090)
+class SpotifyHttpManagerTest {
+
+  private final SpotifyHttpManager spotifyHttpManager = new SpotifyHttpManager(new Builder());
+
+  @ParameterizedTest
+  @ValueSource(ints = {405, 409, 410, 414, 422, 431, 499})
+  public void throwsSpotifyWebApiExceptionForAll4xxStatusCodes(int statusCode) {
+
+    stubFor(get("/test/foo/")
+      .willReturn(aResponse()
+        .withStatus(statusCode)));
+
+    Assertions.assertThrows(SpotifyWebApiException.class, () ->
+      spotifyHttpManager.get(URI.create("http://localhost:9090/test/foo/"), new Header[0]));
+  }
+
+  @ParameterizedTest
+  @ValueSource(ints = {501, 504, 599})
+  public void throwsSpotifyWebApiExceptionForAll5xxStatusCodes(int statusCode) {
+
+    stubFor(get("/test/foo/")
+      .willReturn(aResponse()
+        .withStatus(statusCode)));
+
+    Assertions.assertThrows(SpotifyWebApiException.class, () ->
+      spotifyHttpManager.get(URI.create("http://localhost:9090/test/foo/"), new Header[0]));
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -350,6 +350,11 @@ private String getResponseBody(CloseableHttpResponse httpResponse) throws`
`350`	`350`	`case HttpStatus.SC_SERVICE_UNAVAILABLE:`
`351`	`351`	`throw new ServiceUnavailableException(errorMessage);`
`352`	`352`	`default:`
	`353`	`+ if (httpResponse.getCode() >= 400 && httpResponse.getCode() < 500) {`
	`354`	`+ throw new BadRequestException(errorMessage);`
	`355`	`+ } else if (httpResponse.getCode() >= 500) {`
	`356`	`+ throw new InternalServerErrorException(errorMessage);`
	`357`	`+ }`
`353`	`358`	`return responseBody;`
`354`	`359`	`}`
`355`	`360`	`}`