Move validateResponseCode to Response

Make HttpResponseException extend ExtractionException
Remove HttpUtils

Author: absurdlylongusername

extractor/src/main/java/org/schabi/newpipe/extractor/downloader/Response.java

@@ -2,12 +2,12 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
 import org.schabi.newpipe.extractor.exceptions.HttpResponseException;
-import org.schabi.newpipe.extractor.utils.HttpUtils;
 
 /**
  * A Data class used to hold the results from requests made by the Downloader implementation.
@@ -33,6 +33,28 @@ public Response(final int responseCode,
         this.latestUrl = latestUrl;
     }
 
+    /**
+     * Validates the response codes for the given {@link Response}, and throws
+     * a {@link HttpResponseException} if the code is invalid
+     * @param response The response to validate
+     * @param validResponseCodes Expected valid response codes
+     * @throws HttpResponseException Thrown when the response code is not in {@code validResponseCodes},
+     * or when {@code  validResponseCodes} is empty and the code is a 4xx or 5xx error.
+     */
+    // CHECKSTYLE:ON
+    public static void validateResponseCode(final Response response,
+                                            final int... validResponseCodes)
+        throws HttpResponseException {
+        final int code = response.responseCode();
+        final var throwError = (validResponseCodes == null || validResponseCodes.length == 0)
+            ? code >= 400 && code <= 599
+            : Arrays.stream(validResponseCodes).noneMatch(c -> c == code);
+
+        if (throwError) {
+            throw new HttpResponseException(response);
+        }
+    }
+
     public int responseCode() {
         return responseCode;
     }
@@ -83,12 +105,13 @@ public String getHeader(final String name) {
 
         return null;
     }
+
     // CHECKSTYLE:OFF
     /**
      * Helper function simply to make it easier to validate response code inline
      * before getting the code/body/latestUrl/etc.
      * Validates the response codes for the given {@link Response}, and throws a {@link HttpResponseException} if the code is invalid
-     * @see HttpUtils#validateResponseCode(Response, int...)
+     * @see Response#validateResponseCode(Response, int...)
      * @param validResponseCodes Expected valid response codes
      * @return {@link this} response
      * @throws HttpResponseException Thrown when the response code is not in {@code validResponseCodes},
@@ -97,7 +120,7 @@ public String getHeader(final String name) {
     // CHECKSTYLE:ON
     public Response validateResponseCode(final int... validResponseCodes)
         throws HttpResponseException {
-        HttpUtils.validateResponseCode(this, validResponseCodes);
+        validateResponseCode(this, validResponseCodes);
         return this;
     }
 }

extractor/src/main/java/org/schabi/newpipe/extractor/exceptions/HttpResponseException.java

@@ -1,9 +1,8 @@
 package org.schabi.newpipe.extractor.exceptions;
 
-import java.io.IOException;
 import org.schabi.newpipe.extractor.downloader.Response;
 
-public class HttpResponseException extends IOException {
+public class HttpResponseException extends ExtractionException {
     public HttpResponseException(final Response response) {
         this("Error in HTTP Response for " + response.latestUrl() + "\n\t"
             + response.responseCode() + " - " + response.responseMessage());

extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudParsingHelper.java

@@ -5,7 +5,7 @@
 import static org.schabi.newpipe.extractor.ServiceList.SoundCloud;
 import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty;
 import static org.schabi.newpipe.extractor.utils.Utils.replaceHttpWithHttps;
-import static org.schabi.newpipe.extractor.utils.HttpUtils.validateResponseCode;
+import static org.schabi.newpipe.extractor.downloader.Response.validateResponseCode;
 
 import com.grack.nanojson.JsonArray;
 import com.grack.nanojson.JsonObject;
@@ -21,6 +21,7 @@
 import org.schabi.newpipe.extractor.downloader.Downloader;
 import org.schabi.newpipe.extractor.downloader.Response;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.extractor.exceptions.HttpResponseException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
 import org.schabi.newpipe.extractor.services.soundcloud.extractors.SoundcloudChannelInfoItemExtractor;
@@ -178,7 +179,7 @@ public static JsonObject resolveFor(@Nonnull final Downloader downloader, final
      * @return the url resolved
      */
     public static String resolveUrlWithEmbedPlayer(final String apiUrl) throws IOException,
-            ReCaptchaException {
+        ReCaptchaException, HttpResponseException {
 
         final var response = NewPipe.getDownloader().get("https://w.soundcloud.com/player/?url="
                 + Utils.encodeUrlUtf8(apiUrl), SoundCloud.getLocalization());