skip recovering the body from a failed response handling either because the response is a known binary type or because a UnrecoverableException was thrown

Author: ryber

unirest-bdd-tests/src/test/java/BehaviorTests/AsFileTest.java

@@ -26,6 +26,7 @@
 package BehaviorTests;
 
 import kong.unirest.HttpResponse;
+import kong.unirest.ProgressMonitor;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -38,8 +39,7 @@
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 class AsFileTest extends BddTest {
 
@@ -153,4 +153,15 @@ void canOverrideExistingFiles_Async() throws Exception {
 
         assertEquals(f1, f2);
     }
+
+    @Test
+    void dontReadFilesWhenInError() {
+        HttpResponse<File> f1 = Unirest.get(MockServer.BINARYFILE)
+                .downloadMonitor((field, fileName, bytesWritten, totalBytes) -> {
+                    throw new RuntimeException("hey hey hey");
+                })
+                .asFile(test.toString());
+
+        assertEquals("", f1.getParsingError().get().getOriginalBody());
+    }
 }

unirest/src/main/java/kong/unirest/FileResponse.java

@@ -26,7 +26,6 @@
 package kong.unirest;
 
 import java.io.File;
-import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.CopyOption;
 import java.nio.file.Files;
@@ -43,8 +42,8 @@ public FileResponse(RawResponse r, String path, ProgressMonitor downloadMonitor,
             InputStream content = getContent(r, downloadMonitor, target);
             Files.copy(content, target, copyOptions);
             body = target.toFile();
-        } catch (IOException e) {
-            throw new UnirestException(e);
+        } catch (Exception e) {
+            throw new UnrecoverableException(e);
         }
     }
 

unirest/src/main/java/kong/unirest/UnrecoverableException.java

@@ -0,0 +1,35 @@
+/**
+ * The MIT License
+ *
+ * Copyright for portions of unirest-java are held by Kong Inc (c) 2013.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package kong.unirest;
+
+/**
+ * An exception which prevents Unirest from attempting to recover the body from a failed response / parsing error
+ */
+public class UnrecoverableException extends UnirestException {
+    public UnrecoverableException(Exception e) {
+        super(e);
+    }
+}

unirest/src/main/java/kong/unirest/apache/ApacheResponse.java

@@ -76,7 +76,7 @@ public InputStream getContent() {
 
     @Override
     public byte[] getContentAsBytes() {
-        if (!hasContent()) {
+        if (!hasContent() || ContentType.isBinary(getContentType())) {
             return new byte[0];
         }
         try {

unirest/src/main/java/kong/unirest/apache/BaseApacheClient.java

@@ -58,6 +58,8 @@ static CredentialsProvider toApacheCreds(Proxy proxy) {
     protected <T> HttpResponse<T> transformBody(Function<RawResponse, HttpResponse<T>> transformer, RawResponse rr) {
         try {
             return transformer.apply(rr);
+        }catch (UnrecoverableException ue){
+            return new BasicResponse(rr, "", ue);
         }catch (RuntimeException e){
             String originalBody = recoverBody(rr);
             return new BasicResponse(rr, originalBody, e);