Skip to content

Commit ca802fd

Browse files
Merge branch 'WORDSCLOUD-1208' into 'master'
Wordscloud 1208 See merge request words-cloud/words-cloud-java!12
2 parents 77faf5b + 5d291b2 commit ca802fd

File tree

76 files changed

+7990
-5521
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+7990
-5521
lines changed
6.77 MB
Binary file not shown.

src/main/java/com/aspose/words/cloud/ApiClient.java

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1047,16 +1047,22 @@ public RequestBody buildRequestBodyFormEncoding(Map<String, Object> formParams)
10471047
*/
10481048
public RequestBody buildRequestBodyMultipart(Map<String, Object> formParams) throws IOException {
10491049
MultipartBuilder mpBuilder = new MultipartBuilder().type(MultipartBuilder.FORM);
1050-
for (Entry<String, Object> param : formParams.entrySet()) {
1051-
if (param.getValue() instanceof byte[]) {
1052-
byte[] file = (byte[]) param.getValue();
1053-
Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + param.getKey() + "\"; filename=\"" + param.getKey() + "\"");
1054-
MediaType mediaType = MediaType.parse(guessContentTypeFromFile(file));
1055-
mpBuilder.addPart(partHeaders, RequestBody.create(mediaType, file));
1056-
}
1057-
else {
1058-
Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + param.getKey() + "\"");
1059-
mpBuilder.addPart(partHeaders, RequestBody.create(null, parameterToString(param.getValue())));
1050+
if (formParams.isEmpty()) {
1051+
Headers partHeaders = Headers.of("Content-Disposition", "form-data");
1052+
mpBuilder.addPart(partHeaders, RequestBody.create(MediaType.parse("none"), new byte[] {}));
1053+
}
1054+
else {
1055+
for (Entry<String, Object> param : formParams.entrySet()) {
1056+
if (param.getValue() instanceof byte[]) {
1057+
byte[] file = (byte[]) param.getValue();
1058+
Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + param.getKey() + "\"; filename=\"" + param.getKey() + "\"");
1059+
MediaType mediaType = MediaType.parse(guessContentTypeFromFile(file));
1060+
mpBuilder.addPart(partHeaders, RequestBody.create(mediaType, file));
1061+
}
1062+
else {
1063+
Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + param.getKey() + "\"");
1064+
mpBuilder.addPart(partHeaders, RequestBody.create(null, parameterToString(param.getValue())));
1065+
}
10601066
}
10611067
}
10621068
return mpBuilder.build();

src/test/java/com/aspose/words/cloud/Common/TestApiCoverage.java

Lines changed: 0 additions & 96 deletions
This file was deleted.

src/test/java/com/aspose/words/cloud/Common/TestCommon.java

Lines changed: 0 additions & 89 deletions
This file was deleted.

src/test/java/com/aspose/words/cloud/Common/TestErrorHandling.java

Lines changed: 0 additions & 60 deletions
This file was deleted.

src/test/java/com/aspose/words/cloud/DocumentActions/TestAppendDocument.java

Lines changed: 0 additions & 68 deletions
This file was deleted.

0 commit comments

Comments
 (0)