Backport/Sync code from NewPipe implementation

Author: litetex

extractor/src/test/java/org/schabi/newpipe/downloader/DownloaderTestImpl.java

@@ -22,8 +22,8 @@ public final class DownloaderTestImpl extends Downloader {
     /**
      * Should be the latest Firefox ESR version.
      */
-    private static final String USER_AGENT
-            = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:128.0) Gecko/20100101 Firefox/128.0";
+    private static final String USER_AGENT =
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:128.0) Gecko/20100101 Firefox/128.0";
     private static DownloaderTestImpl instance;
     private final RateLimitedClientWrapper clientWrapper;
 
@@ -65,41 +65,36 @@ public Response execute(@Nonnull final Request request)
         }
 
         final okhttp3.Request.Builder requestBuilder = new okhttp3.Request.Builder()
-                .method(httpMethod, requestBody).url(url)
-                .addHeader("User-Agent", USER_AGENT);
-
-        for (final Map.Entry<String, List<String>> pair : headers.entrySet()) {
-            final String headerName = pair.getKey();
-            final List<String> headerValueList = pair.getValue();
+            .method(httpMethod, requestBody)
+            .url(url)
+            .addHeader("User-Agent", USER_AGENT);
+
+        headers.forEach((headerName, headerValueList) -> {
+            requestBuilder.removeHeader(headerName);
+            headerValueList.forEach(headerValue ->
+                requestBuilder.addHeader(headerName, headerValue));
+        });
+
+        try (okhttp3.Response response =
+                 clientWrapper.executeRequestWithLimit(requestBuilder.build())
+        ) {
+            if (response.code() == 429) {
+                throw new ReCaptchaException("reCaptcha Challenge requested", url);
+            }
 
-            if (headerValueList.size() > 1) {
-                requestBuilder.removeHeader(headerName);
-                for (final String headerValue : headerValueList) {
-                    requestBuilder.addHeader(headerName, headerValue);
+            String responseBodyToReturn = null;
+            try (ResponseBody body = response.body()) {
+                if (body != null) {
+                    responseBodyToReturn = body.string();
                 }
-            } else if (headerValueList.size() == 1) {
-                requestBuilder.header(headerName, headerValueList.get(0));
             }
-        }
-
-        final okhttp3.Response response =
-            clientWrapper.executeRequestWithLimit(requestBuilder.build());
-
-        if (response.code() == 429) {
-            response.close();
 
-            throw new ReCaptchaException("reCaptcha Challenge requested", url);
+            return new Response(
+                response.code(),
+                response.message(),
+                response.headers().toMultimap(),
+                responseBodyToReturn,
+                response.request().url().toString());
         }
-
-        final ResponseBody body = response.body();
-        String responseBodyToReturn = null;
-
-        if (body != null) {
-            responseBodyToReturn = body.string();
-        }
-
-        final String latestUrl = response.request().url().toString();
-        return new Response(response.code(), response.message(), response.headers().toMultimap(),
-                responseBodyToReturn, latestUrl);
     }
 }