Skip to content

Commit 2962532

Browse files
Fix support for non-ascii chars in upload URL
1 parent c108348 commit 2962532

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

cloudinary-http43/src/main/java/com/cloudinary/http43/UploaderStrategy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
100100
if (filename == null) filename = ((File) file).getName();
101101
multipart.addBinaryBody("file", (File) file, ContentType.APPLICATION_OCTET_STREAM, filename);
102102
} else if (file instanceof String) {
103-
multipart.addTextBody("file", (String) file);
103+
multipart.addTextBody("file", (String) file, contentType);
104104
} else if (file instanceof byte[]) {
105105
if (filename == null) filename = "file";
106106
multipart.addBinaryBody("file", (byte[]) file, ContentType.APPLICATION_OCTET_STREAM, filename);

cloudinary-http44/src/main/java/com/cloudinary/http44/UploaderStrategy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
100100
if (filename == null) filename = ((File) file).getName();
101101
multipart.addBinaryBody("file", (File) file, ContentType.APPLICATION_OCTET_STREAM, filename);
102102
} else if (file instanceof String) {
103-
multipart.addTextBody("file", (String) file);
103+
multipart.addTextBody("file", (String) file, contentType);
104104
} else if (file instanceof byte[]) {
105105
if (filename == null) filename = "file";
106106
multipart.addBinaryBody("file", (byte[]) file, ContentType.APPLICATION_OCTET_STREAM, filename);

cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractUploaderTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ public void testUploadDataUri() throws IOException {
109109
public void testUploadUTF8() throws IOException {
110110
Map result = cloudinary.uploader().upload("../cloudinary-test-common/src/main/resources/old_logo.png", ObjectUtils.asMap("public_id", "Plattenkreiss_ñg-é"));
111111
assertEquals(result.get("public_id"), "Plattenkreiss_ñg-é");
112+
cloudinary.uploader().upload(result.get("url"), ObjectUtils.emptyMap());
112113
}
113114

114115
@Test

0 commit comments

Comments
 (0)