fix: fix download for empty files

box · Jan 31, 2024 · ff36f13 · ff36f13
1 parent 9a94a1a
commit ff36f13
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 1 deletion.
diff --git a/src/intTest/java/com/box/sdk/BoxFileIT.java b/src/intTest/java/com/box/sdk/BoxFileIT.java
@@ -966,6 +966,37 @@ public void setsAndRetrievesDispositionAt() throws ParseException {
         }
     }
 
+    @Test
+    public void uploadAndDownloadEmptyFileSucceeds() throws IOException {
+        BoxAPIConnection api = jwtApiForServiceAccount();
+        BoxAPIConnection api = new BoxAPIConnection(accessToken);
+        BoxFolder folder = getUniqueFolder(api);
+        String fileName = "empty_file";
+        URL fileURL = this.getClass().getResource("/sample-files/" + fileName);
+        String filePath = URLDecoder.decode(fileURL.getFile(), "utf-8");
+        long fileSize = new File(filePath).length();
+        byte[] fileContent = readAllBytes(filePath);
+        BoxFile uploadedFile = null;
+        try {
+            InputStream uploadStream = Files.newInputStream(Paths.get(filePath));
+            ProgressListener mockUploadListener = mock(ProgressListener.class);
+            BoxFile.Info uploadedFileInfo = folder.uploadFile(
+                uploadStream, BoxFileIT.generateString(), fileSize, mockUploadListener
+            );
+            uploadedFile = uploadedFileInfo.getResource();
+
+            ByteArrayOutputStream downloadStream = new ByteArrayOutputStream();
+            uploadedFile.download(downloadStream);
+            byte[] downloadedFileContent = downloadStream.toByteArray();
+
+            assertThat(downloadedFileContent, is(equalTo(fileContent)));
+            assertThat(folder, hasItem(Matchers.<BoxItem.Info>hasProperty("ID", equalTo(uploadedFile.getID()))));
+        } finally {
+            deleteFile(uploadedFile);
+        }
+
+    }
+
     private byte[] readFileContent(String fileName) throws IOException {
         URL fileURL = this.getClass().getResource("/sample-files/" + fileName);
         String filePath = URLDecoder.decode(fileURL.getFile(), "utf-8");

diff --git a/src/main/java/com/box/sdk/BoxAPIResponse.java b/src/main/java/com/box/sdk/BoxAPIResponse.java
@@ -148,7 +148,7 @@ static BoxAPIResponse toBoxResponse(Response response) {
             );
         }
         ResponseBody responseBody = response.body();
-        if (responseBody.contentLength() == 0 || responseBody.contentType() == null) {
+        if (responseBody.contentType() == null) {
             try {
                 return new BoxAPIResponse(response.code(),
                         response.request().method(),

diff --git a/src/test/resources/sample-files/empty_file b/src/test/resources/sample-files/empty_file