Fix code

Author: congminh1254

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

@@ -225,6 +225,50 @@ public void uploadAndDownloadFileSucceeds() throws IOException {
 
     }
 
+    @Test
+    public void uploadAndDownloadFileUseZstdSucceeds() throws IOException {
+        BoxAPIConnection api = jwtApiForServiceAccount();
+        api.setUseZstdCompression(true);
+
+        String fileName = "smalltest.pdf";
+        URL fileURL = this.getClass().getResource("/sample-files/" + fileName);
+        String filePath = URLDecoder.decode(fileURL.getFile(), "utf-8");
+        byte[] fileContent = readAllBytes(filePath);
+        BoxFile file = null;
+        try {
+            file = uploadSampleFileToUniqueFolder(api, fileName);
+            ByteArrayOutputStream downloadStream = new ByteArrayOutputStream();
+            ProgressListener mockDownloadListener = mock(ProgressListener.class);
+            file.download(downloadStream, mockDownloadListener);
+            byte[] downloadedFileContent = downloadStream.toByteArray();
+            assertThat(downloadedFileContent, is(equalTo(fileContent)));
+        } finally {
+            deleteFile(file);
+        }
+    }
+
+    @Test
+    public void uploadAndDownloadFileDisabledZstdSucceeds() throws IOException {
+        BoxAPIConnection api = jwtApiForServiceAccount();
+        api.setUseZstdCompression(false);
+
+        String fileName = "smalltest.pdf";
+        URL fileURL = this.getClass().getResource("/sample-files/" + fileName);
+        String filePath = URLDecoder.decode(fileURL.getFile(), "utf-8");
+        byte[] fileContent = readAllBytes(filePath);
+        BoxFile file = null;
+        try {
+            file = uploadSampleFileToUniqueFolder(api, fileName);
+            ByteArrayOutputStream downloadStream = new ByteArrayOutputStream();
+            ProgressListener mockDownloadListener = mock(ProgressListener.class);
+            file.download(downloadStream, mockDownloadListener);
+            byte[] downloadedFileContent = downloadStream.toByteArray();
+            assertThat(downloadedFileContent, is(equalTo(fileContent)));
+        } finally {
+            deleteFile(file);
+        }
+    }
+
     @Test
     public void downloadFileRangeSucceeds() throws IOException {
         BoxAPIConnection api = jwtApiForServiceAccount();

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

@@ -122,6 +122,7 @@ public class BoxAPIConnection {
     private int maxRetryAttempts;
     private int connectTimeout;
     private int readTimeout;
+    private Boolean useZstdCompression;
     private final List<BoxAPIConnectionListener> listeners;
     private RequestInterceptor interceptor;
     private final Map<String, String> customHeaders;
@@ -160,6 +161,7 @@ public BoxAPIConnection(String clientID, String clientSecret, String accessToken
         this.maxRetryAttempts = BoxGlobalSettings.getMaxRetryAttempts();
         this.connectTimeout = BoxGlobalSettings.getConnectTimeout();
         this.readTimeout = BoxGlobalSettings.getReadTimeout();
+        this.useZstdCompression = BoxGlobalSettings.getUseZstdCompression();
         this.refreshLock = new ReentrantReadWriteLock();
         this.userAgent = "Box Java SDK v" + SDK_VERSION + " (Java " + JAVA_VERSION + ")";
         this.listeners = new ArrayList<>();
@@ -237,7 +239,9 @@ private void buildHttpClients() {
             }
         }
         builder = modifyHttpClientBuilder(builder);
-        builder.addInterceptor(new ZstdInterceptor());
+        if (this.useZstdCompression) {
+            builder.addNetworkInterceptor(new ZstdInterceptor());
+        }
 
         this.httpClient = builder.build();
         this.noRedirectsHttpClient = new OkHttpClient.Builder(httpClient)
@@ -658,6 +662,23 @@ public void setConnectTimeout(int connectTimeout) {
         buildHttpClients();
     }
 
+    /*
+     * Gets if request use zstd encoding when possible
+     * @return true if request use zstd encoding when possible
+     */
+    public Boolean getUseZstdCompression() {
+        return this.useZstdCompression;
+    }
+
+    /*
+     * Sets if request use zstd encoding when possible
+     * @param useZstdCompression true if request use zstd encoding when possible
+     */
+    public void setUseZstdCompression(Boolean useZstdCompression) {
+        this.useZstdCompression = useZstdCompression;
+        buildHttpClients();
+    }
+
     /**
      * Gets the read timeout for this connection in milliseconds.
      *

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

@@ -7,6 +7,7 @@ public final class BoxGlobalSettings {
     private static int connectTimeout = 0;
     private static int readTimeout = 0;
     private static int maxRetryAttempts = BoxAPIConnection.DEFAULT_MAX_RETRIES;
+    private static boolean useZstdCompression = true;
 
     private BoxGlobalSettings() {
     }
@@ -67,4 +68,20 @@ public static int getMaxRetryAttempts() {
     public static void setMaxRetryAttempts(int attempts) {
         BoxGlobalSettings.maxRetryAttempts = attempts;
     }
+
+    /*
+     * Returns the global settings for using Zstd compression.
+     * @return true if Zstd compression is enabled, false otherwise
+     */
+    public static boolean getUseZstdCompression() {
+        return useZstdCompression;
+    }
+
+    /*
+     * Sets the global settings for using Zstd compression.
+     * @param useZstdCompression true to enable Zstd compression, false otherwise
+     */
+    public static void setUseZstdCompression(boolean useZstdCompression) {
+        BoxGlobalSettings.useZstdCompression = useZstdCompression;
+    }
 }

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

@@ -1,31 +1,35 @@
 package com.box.sdk;
 
 import com.github.luben.zstd.ZstdInputStream;
-import java.util.List;
-import okhttp3.*;
 import java.io.ByteArrayOutputStream;
-
 import java.io.IOException;
+import okhttp3.Interceptor;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Interceptor that adds zstd compression support to API requests.
  * This interceptor adds zstd to the Accept-Encoding header and handles decompression of zstd responses.
  */
 public class ZstdInterceptor implements Interceptor {
+    @NotNull
     @Override
     public Response intercept(Chain chain) throws IOException {
         Request request = chain.request();
 
         // Add zstd to the Accept-Encoding header
         String acceptEncoding;
-        List<String> acceptEncodingHeaders = request.headers("Accept-Encoding");
-        if (acceptEncodingHeaders.isEmpty()) {
+        String acceptEncodingHeader = request.header("Accept-Encoding");
+        if (acceptEncodingHeader == null) {
             acceptEncoding = "zstd";
         } else {
-            acceptEncoding = acceptEncodingHeaders.get(0) + ", zstd";
+            acceptEncoding = acceptEncodingHeader + ", zstd";
         }
 
         Request compressedRequest = request.newBuilder()
+            .removeHeader("Accept-Encoding")
             .addHeader("Accept-Encoding", acceptEncoding)
             .build();
 
@@ -55,13 +59,13 @@ public Response intercept(Chain chain) throws IOException {
 
         // Create a new response body that serves the buffered content
         ResponseBody decompressedBody = ResponseBody.create(
-            originalBody.contentType(),
-            decompressedBytes
+            decompressedBytes,
+            originalBody.contentType()
         );
 
         return response.newBuilder()
             .body(decompressedBody)
-            .removeHeader("Content-Encoding")
+            .removeHeader("X-Content-Encoding")
             .removeHeader("Content-Length")
             .build();
     }

src/test/java/com/box/sdk/BoxAPIRequestTest.java

@@ -356,7 +356,7 @@ public void handlesZstdResponse() throws IOException {
         BoxAPIConnection api = createConnectionWith(boxMockUrl().toString());
         BoxAPIRequest request = new BoxAPIRequest(api, boxMockUrl(), "GET");
         String jsonString = "{\"foo\":\"bar\"}";
-        
+
         stubFor(get(urlEqualTo("/")).willReturn(
             aResponse()
                 .withStatus(200)