fix: Fixed canceling sign request fails because of empty body (#1085)

Author: antusus

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

@@ -110,7 +110,7 @@ public void updateInfoSucceeds() {
     }
 
     @Test(timeout = 60000)
-    public void uploadAvatar() throws IOException, InterruptedException {
+    public void uploadGetAndDeleteAvatar() throws IOException, InterruptedException {
         // given
         BoxAPIConnection api = jwtApiForServiceAccount();
         String filePath = getSampleFilePath("red_100x100.png");
@@ -132,15 +132,6 @@ public void uploadAvatar() throws IOException, InterruptedException {
                 throw new RuntimeException(e);
             }
         }, 5, 1000);
-    }
-
-    @Test(timeout = 60000)
-    public void deleteAvatar() throws IOException {
-        // given
-        BoxAPIConnection api = jwtApiForServiceAccount();
-        String filePath = getSampleFilePath("red_100x100.png");
-        BoxUser user = new BoxUser(api, TestConfig.getUserId());
-        user.uploadAvatar(new File(filePath));
 
         // when
         user.deleteAvatar();

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

@@ -47,6 +47,7 @@ public class BoxAPIRequest {
     private static final int MAX_REDIRECTS = 3;
     private static final String ERROR_CREATING_REQUEST_BODY = "Error creating request body";
     private static final int BUFFER_SIZE = 8192;
+    private static final EmptyBody EMPTY_BODY = new EmptyBody();
     private static SSLSocketFactory sslSocketFactory;
 
     static {
@@ -616,6 +617,18 @@ protected void writeBody(HttpURLConnection connection, ProgressListener listener
         }
 
         connection.setDoOutput(true);
+
+        if (bodyLength > 0) {
+            connection.setFixedLengthStreamingMode((int) this.bodyLength);
+        }
+
+        // if method requires body, but it is empty we do not write anything.
+        // Just tell HTTP client to add proper Content-length header
+        if (this.body instanceof EmptyBody) {
+            connection.setFixedLengthStreamingMode(0);
+            return;
+        }
+
         try {
             OutputStream output = connection.getOutputStream();
             if (listener != null) {
@@ -676,11 +689,6 @@ private BoxAPIResponse trySend(ProgressListener listener) {
             }
         }
 
-        if (this.bodyLength > 0) {
-            connection.setFixedLengthStreamingMode((int) this.bodyLength);
-            connection.setDoOutput(true);
-        }
-
         if (this.api != null) {
             if (this.shouldAuthenticate) {
                 connection.addRequestProperty(HttpHeaders.AUTHORIZATION, "Bearer " + this.api.lockAccessToken());
@@ -842,6 +850,15 @@ void shouldAuthenticate(boolean shouldAuthenticate) {
         this.shouldAuthenticate = shouldAuthenticate;
     }
 
+    /**
+     * Use it to force sending empty body with HTTP methods that require body to be sent.
+     * This will force HTTP client to add proper Content-length header.
+     */
+    void noBody() {
+        this.bodyLength = 0;
+        this.body = EMPTY_BODY;
+    }
+
     /**
      * Class for mapping a request header and value.
      */
@@ -878,4 +895,12 @@ public String getValue() {
             return this.value;
         }
     }
+
+    private static final class EmptyBody extends InputStream {
+
+        @Override
+        public int read() throws IOException {
+            return 0;
+        }
+    }
 }

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

@@ -227,6 +227,7 @@ public BoxSignRequest.Info getInfo(String... fields) {
     public BoxSignRequest.Info cancel() {
         URL url = SIGN_REQUEST_CANCEL_URL_TEMPLATE.buildAlphaWithQuery(getAPI().getBaseURL(), "", this.getID());
         BoxAPIRequest request = new BoxAPIRequest(getAPI(), url, "POST");
+        request.noBody();
         BoxJSONResponse response = (BoxJSONResponse) request.send();
         JsonObject responseJSON = Json.parse(response.getJSON()).asObject();
         return new BoxSignRequest.Info(responseJSON);