diff --git a/src/main/java/com/box/sdk/BoxFile.java b/src/main/java/com/box/sdk/BoxFile.java index 2f12279c4..fd5cbfd22 100644 --- a/src/main/java/com/box/sdk/BoxFile.java +++ b/src/main/java/com/box/sdk/BoxFile.java @@ -716,8 +716,8 @@ public void canUploadVersion(String name, long fileSize, String parentID) { preflightInfo.add("size", fileSize); request.setBody(preflightInfo.toString()); - BoxAPIResponse response = request.send(); - response.disconnect(); + BoxJSONResponse response = (BoxJSONResponse) request.send(); + response.getJSON(); } /** diff --git a/src/main/java/com/box/sdk/BoxFolder.java b/src/main/java/com/box/sdk/BoxFolder.java index d2fa79128..615464eca 100644 --- a/src/main/java/com/box/sdk/BoxFolder.java +++ b/src/main/java/com/box/sdk/BoxFolder.java @@ -466,8 +466,8 @@ public void canUpload(String name, long fileSize) { preflightInfo.add("size", fileSize); request.setBody(preflightInfo.toString()); - BoxAPIResponse response = request.send(); - response.disconnect(); + BoxJSONResponse response = (BoxJSONResponse) request.send(); + response.getJSON(); } /** diff --git a/src/test/Fixtures/BoxFile/CanUploadFile200.json b/src/test/Fixtures/BoxFile/CanUploadFile200.json new file mode 100644 index 000000000..b4f2dc113 --- /dev/null +++ b/src/test/Fixtures/BoxFile/CanUploadFile200.json @@ -0,0 +1,4 @@ +{ + "upload_token": "Pc3FIOG9vSGV4VHo4QzAyg5T1JvNnJoZ3ExaVNyQWw6WjRsanRKZG5lQk9qUE1BVQP", + "upload_url": "https://upload-las.app.box.com/api/2.0/files/content?upload_session_id=1234" +} diff --git a/src/test/java/com/box/sdk/BoxFileTest.java b/src/test/java/com/box/sdk/BoxFileTest.java index 23590ca72..2f0fab9f2 100644 --- a/src/test/java/com/box/sdk/BoxFileTest.java +++ b/src/test/java/com/box/sdk/BoxFileTest.java @@ -845,6 +845,7 @@ public void testChunkedUploadWithCorrectPartSize() throws IOException, Interrupt String sessionResult = TestConfig.getFixture("BoxFile/CreateUploadSession201", wireMockRule.port()); String uploadResult = TestConfig.getFixture("BoxFile/UploadPartOne200"); String commitResult = TestConfig.getFixture("BoxFile/CommitUpload201"); + String canUploadResult = TestConfig.getFixture("BoxFile/CanUploadFile200"); JsonObject idObject = new JsonObject() .add("id", "12345"); @@ -874,7 +875,8 @@ public void testChunkedUploadWithCorrectPartSize() throws IOException, Interrupt .withRequestBody(WireMock.equalToJson(preflightObject.toString())) .willReturn(WireMock.aResponse() .withHeader("Content-Type", "application/json") - .withStatus(200))); + .withStatus(200) + .withBody(canUploadResult))); wireMockRule.stubFor(WireMock.post(WireMock.urlPathEqualTo(sessionURL)) .withRequestBody(WireMock.equalToJson(sessionObject.toString())) diff --git a/src/test/java/com/box/sdk/BoxFolderTest.java b/src/test/java/com/box/sdk/BoxFolderTest.java index e7842e999..3dba73c44 100644 --- a/src/test/java/com/box/sdk/BoxFolderTest.java +++ b/src/test/java/com/box/sdk/BoxFolderTest.java @@ -96,6 +96,7 @@ public void testChunkedUploadWithCorrectPartSizeAndAttributes() throws IOExcepti String sessionResult = TestConfig.getFixture("BoxFile/CreateUploadSession201", wireMockRule.port()); String uploadResult = TestConfig.getFixture("BoxFile/UploadPartOne200"); String commitResult = TestConfig.getFixture("BoxFile/CommitUploadWithAttributes201"); + String canUploadResult = TestConfig.getFixture("BoxFile/CanUploadFile200"); JsonObject idObject = new JsonObject() .add("id", "12345"); @@ -134,7 +135,8 @@ public void testChunkedUploadWithCorrectPartSizeAndAttributes() throws IOExcepti .withRequestBody(WireMock.equalToJson(preflightObject.toString())) .willReturn(WireMock.aResponse() .withHeader("Content-Type", "application/json") - .withStatus(200))); + .withStatus(200) + .withBody(canUploadResult))); wireMockRule.stubFor(WireMock.post(WireMock.urlPathEqualTo(sessionURL)) .withRequestBody(WireMock.equalToJson(sessionObject.toString())) @@ -182,6 +184,7 @@ public void testChunkedParallelUploadWithCorrectPartSizeAndAttributes() throws I String sessionResult = TestConfig.getFixture("BoxFile/CreateUploadSession201", wireMockRule.port()); String uploadResult = TestConfig.getFixture("BoxFile/UploadPartOne200"); String commitResult = TestConfig.getFixture("BoxFile/CommitUploadWithAttributes201"); + String canUploadResult = TestConfig.getFixture("BoxFile/CanUploadFile200"); JsonObject idObject = new JsonObject() .add("id", "12345"); @@ -220,7 +223,8 @@ public void testChunkedParallelUploadWithCorrectPartSizeAndAttributes() throws I .withRequestBody(WireMock.equalToJson(preflightObject.toString())) .willReturn(WireMock.aResponse() .withHeader("Content-Type", "application/json") - .withStatus(200))); + .withStatus(200) + .withBody(canUploadResult))); wireMockRule.stubFor(WireMock.post(WireMock.urlPathEqualTo(sessionURL)) .withRequestBody(WireMock.equalToJson(sessionObject.toString())) @@ -272,6 +276,7 @@ public void testChunkedUploadWith500Error() throws IOException, InterruptedExcep String sessionResult = TestConfig.getFixture("BoxFile/CreateUploadSession201", wireMockRule.port()); String partsResult = TestConfig.getFixture("BoxFile/ListUploadedPart200"); String commitResult = TestConfig.getFixture("BoxFile/CommitUpload201"); + String canUploadResult = TestConfig.getFixture("BoxFile/CanUploadFile200"); JsonObject idObject = new JsonObject() .add("id", "12345"); @@ -301,7 +306,8 @@ public void testChunkedUploadWith500Error() throws IOException, InterruptedExcep .withRequestBody(WireMock.equalToJson(preflightObject.toString())) .willReturn(WireMock.aResponse() .withHeader("Content-Type", "application/json") - .withStatus(200))); + .withStatus(200) + .withBody(canUploadResult))); wireMockRule.stubFor(WireMock.post(WireMock.urlPathEqualTo(sessionURL)) .withRequestBody(WireMock.equalToJson(sessionObject.toString())) @@ -361,6 +367,7 @@ public void testRetryingChunkedUploadWith500Error() throws IOException, Interrup String uploadResult = TestConfig.getFixture("BoxFile/UploadPartOne200"); String wrongPartsResult = TestConfig.getFixture("BoxFile/ListUploadedParts200"); String commitResult = TestConfig.getFixture("BoxFile/CommitUpload201"); + String canUploadResult = TestConfig.getFixture("BoxFile/CanUploadFile200"); JsonObject idObject = new JsonObject() .add("id", "12345"); @@ -390,7 +397,8 @@ public void testRetryingChunkedUploadWith500Error() throws IOException, Interrup .withRequestBody(WireMock.equalToJson(preflightObject.toString())) .willReturn(WireMock.aResponse() .withHeader("Content-Type", "application/json") - .withStatus(200))); + .withStatus(200) + .withBody(canUploadResult))); wireMockRule.stubFor(WireMock.post(WireMock.urlPathEqualTo(sessionURL)) .withRequestBody(WireMock.equalToJson(sessionObject.toString()))