Update integration tests

Author: congminh1254

src/intTest/java/com/box/sdk/BoxFileIT.java

@@ -1,7 +1,9 @@
 package com.box.sdk;
 
+import static com.box.sdk.BinaryBodyUtils.writeStream;
 import static com.box.sdk.BoxApiProvider.jwtApiForServiceAccount;
 import static com.box.sdk.BoxFile.ALL_VERSION_FIELDS;
+import static com.box.sdk.BoxFile.CONTENT_URL_TEMPLATE;
 import static com.box.sdk.BoxRetentionPolicyAssignment.createAssignmentToFolder;
 import static com.box.sdk.BoxSharedLink.Access.OPEN;
 import static com.box.sdk.CleanupTools.deleteFile;
@@ -237,10 +239,17 @@ public void uploadAndDownloadFileUseZstdSucceeds() throws IOException {
         BoxFile file = null;
         try {
             file = uploadSampleFileToUniqueFolder(api, fileName);
+
             ByteArrayOutputStream downloadStream = new ByteArrayOutputStream();
             ProgressListener mockDownloadListener = mock(ProgressListener.class);
-            file.download(downloadStream, mockDownloadListener);
+
+            URL url = CONTENT_URL_TEMPLATE.build(api.getBaseURL(), file.getID());
+            BoxAPIRequest request = new BoxAPIRequest(api, url, "GET");
+            BoxAPIResponse response = request.send();
+            writeStream(response, downloadStream, mockDownloadListener);
+
             byte[] downloadedFileContent = downloadStream.toByteArray();
+            assertThat(response.getHeaders().get("X-Content-Encoding").get(0), is(equalTo("zstd")));
             assertThat(downloadedFileContent, is(equalTo(fileContent)));
         } finally {
             deleteFile(file);
@@ -259,10 +268,17 @@ public void uploadAndDownloadFileDisabledZstdSucceeds() throws IOException {
         BoxFile file = null;
         try {
             file = uploadSampleFileToUniqueFolder(api, fileName);
+
             ByteArrayOutputStream downloadStream = new ByteArrayOutputStream();
             ProgressListener mockDownloadListener = mock(ProgressListener.class);
-            file.download(downloadStream, mockDownloadListener);
+
+            URL url = CONTENT_URL_TEMPLATE.build(api.getBaseURL(), file.getID());
+            BoxAPIRequest request = new BoxAPIRequest(api, url, "GET");
+            BoxAPIResponse response = request.send();
+            writeStream(response, downloadStream, mockDownloadListener);
+
             byte[] downloadedFileContent = downloadStream.toByteArray();
+            assertThat(response.getHeaders().get("X-Content-Encoding"), is(nullValue()));
             assertThat(downloadedFileContent, is(equalTo(fileContent)));
         } finally {
             deleteFile(file);

src/main/java/com/box/sdk/ZstdInterceptor.java

@@ -65,7 +65,8 @@ public Response intercept(Chain chain) throws IOException {
 
         return response.newBuilder()
             .body(decompressedBody)
-            .removeHeader("X-Content-Encoding")
+            .addHeader("X-Content-Encoding", contentEncoding)
+            .removeHeader("Content-Encoding")
             .removeHeader("Content-Length")
             .build();
     }