Fix upload with unicode characters

Author: adimiz1

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

@@ -23,6 +23,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.Map;
 
@@ -71,7 +72,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
 
         Charset utf8 = Charset.forName("UTF-8");
 
-        MultipartEntity multipart = new MultipartEntity(HttpMultipartMode.BROWSER_COMPATIBLE);
+        MultipartEntity multipart = new MultipartEntity(HttpMultipartMode.BROWSER_COMPATIBLE, null, StandardCharsets.UTF_8);
         // Remove blank parameters
         for (Map.Entry<String, Object> param : params.entrySet()) {
             if (param.getValue() instanceof Collection) {

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

@@ -3,6 +3,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.Map;
 
@@ -87,6 +88,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
 
         MultipartEntityBuilder multipart = MultipartEntityBuilder.create();
         multipart.setMode(HttpMultipartMode.BROWSER_COMPATIBLE);
+        multipart.setCharset(StandardCharsets.UTF_8);
         ContentType contentType = ContentType.MULTIPART_FORM_DATA.withCharset(MIME.UTF8_CHARSET);
         // Remove blank parameters
         for (Map.Entry<String, Object> param : params.entrySet()) {

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

@@ -4,6 +4,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Field;
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.Map;
 
@@ -88,6 +89,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
 
         MultipartEntityBuilder multipart = MultipartEntityBuilder.create();
         multipart.setMode(HttpMultipartMode.BROWSER_COMPATIBLE);
+        multipart.setCharset(StandardCharsets.UTF_8);
         ContentType contentType = ContentType.MULTIPART_FORM_DATA.withCharset(MIME.UTF8_CHARSET);
         // Remove blank parameters
         for (Map.Entry<String, Object> param : params.entrySet()) {

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

@@ -22,6 +22,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.Map;
 
@@ -84,6 +85,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
 
         MultipartEntityBuilder multipart = MultipartEntityBuilder.create();
         multipart.setMode(HttpMultipartMode.BROWSER_COMPATIBLE);
+        multipart.setCharset(StandardCharsets.UTF_8);
         ContentType contentType = ContentType.MULTIPART_FORM_DATA.withCharset(MIME.UTF8_CHARSET);
         // Remove blank parameters
         for (Map.Entry<String, Object> param : params.entrySet()) {

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

@@ -799,6 +799,12 @@ private void addToDeleteList(String type, String id) {
         ids.add(id);
     }
 
+    @Test
+    public void testUploadLocalUnicodeFilename() throws Exception {
+        Map result = cloudinary.uploader().upload(HEBREW_PDF, asMap("resource_type", "raw"));
+        assertTrue(((String)result.get("public_id")).contains(".docx"));
+    }
+
     @Test
     public void testUploadFolderDecoupling() {
         //TODO: Need to build a unit testing infrastructure

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

@@ -15,6 +15,7 @@
 
 public class MockableTest {
 
+    public static final String HEBREW_PDF = "../cloudinary-test-common/src/main/resources/אבג.docx";
     public static final String SRC_TEST_IMAGE = "../cloudinary-test-common/src/main/resources/old_logo.png";
     public static final String SRC_TEST_VIDEO = "http://res.cloudinary.com/demo/video/upload/dog.mp4";
     public static final String SRC_TEST_RAW = "../cloudinary-test-common/src/main/resources/docx.docx";