support filename in upload options. close response objects in http44

Author: itaibenari

cloudinary-android/src/main/java/com/cloudinary/android/MultipartUtility.java

@@ -84,13 +84,18 @@ public void addFormField(String name, String value) {
 	 *            a File to be uploaded
 	 * @throws IOException
 	 */
-	public void addFilePart(String fieldName, File uploadFile) throws IOException {
-		String fileName = uploadFile.getName();
+	public void addFilePart(String fieldName, File uploadFile, String fileName) throws IOException {
+		if (fileName == null) fileName = uploadFile.getName();
 		FileInputStream inputStream = new FileInputStream(uploadFile);
 		addFilePart(fieldName, inputStream, fileName);
 	}
+	
+	public void addFilePart(String fieldName, File uploadFile) throws IOException {
+		addFilePart(fieldName, uploadFile, "file");
+	}
 
 	public void addFilePart(String fieldName, InputStream inputStream, String fileName) throws IOException {
+		if (fileName == null) fileName = "file";
 		writer.append("--" + boundary).append(LINE_FEED);
 		writer.append("Content-Disposition: form-data; name=\"" + fieldName + "\"; filename=\"" + fileName + "\"").append(LINE_FEED);
 		writer.append("Content-Type: " + URLConnection.guessContentTypeFromName(fileName)).append(LINE_FEED);

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

@@ -65,14 +65,15 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
 		if (file instanceof String && !((String) file).matches("ftp:.*|https?:.*|s3:.*|data:[^;]*;base64,([a-zA-Z0-9/+\n=]+)")) {
 			file = new File((String) file);
 		}
+		String filename = (String) options.get("filename");
 		if (file instanceof File) {
-			multipart.addFilePart("file", (File) file);
+			multipart.addFilePart("file", (File) file, filename);
 		} else if (file instanceof String) {
 			multipart.addFormField("file", (String) file);
 		} else if (file instanceof InputStream) {
-			multipart.addFilePart("file", (InputStream) file);
+			multipart.addFilePart("file", (InputStream) file, filename);
 		} else if (file instanceof byte[]) {
-			multipart.addFilePart("file", new ByteArrayInputStream((byte[]) file));
+			multipart.addFilePart("file", new ByteArrayInputStream((byte[]) file), filename);
 		}
 		HttpURLConnection connection = multipart.execute();
 		int code;

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

@@ -84,12 +84,14 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
 		if (file instanceof String && !((String) file).matches("ftp:.*|https?:.*|s3:.*|data:[^;]*;base64,([a-zA-Z0-9/+\n=]+)")) {
 			file = new File((String) file);
 		}
+		String filename = (String) options.get("filename");
 		if (file instanceof File) {
-			multipart.addPart("file", new FileBody((File) file));
+			multipart.addPart("file", new FileBody((File) file, filename, "application/octet-stream", null));
 		} else if (file instanceof String) {
 			multipart.addPart("file", new StringBody((String) file, utf8));
 		} else if (file instanceof byte[]) {
-			multipart.addPart("file", new ByteArrayBody((byte[]) file, "file"));
+			if (filename == null) filename = "file";
+			multipart.addPart("file", new ByteArrayBody((byte[]) file, filename));
 		} else if (file == null) {
 			// no-problem
 		} else {

cloudinary-http42/src/test/java/com/cloudinary/test/ApiTest.java

@@ -6,10 +6,10 @@
 
 import org.junit.Test;
 
-import org.apache.http.conn.ConnectTimeoutException;
+import java.net.SocketTimeoutException;
 
 public class ApiTest extends AbstractApiTest {
-	@Test(expected = ConnectTimeoutException.class)
+	@Test(expected = SocketTimeoutException.class)
     public void testTimeoutException() throws Exception {
         // should allow listing resources
         Map<String, Object> options = new HashMap<String, Object>();

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

@@ -95,12 +95,15 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
 		if (file instanceof String && !((String) file).matches("ftp:.*|https?:.*|s3:.*|data:[^;]*;base64,([a-zA-Z0-9/+\n=]+)")) {
 			file = new File((String) file);
 		}
+		String filename = (String) options.get("filename");
 		if (file instanceof File) {
-			multipart.addBinaryBody("file", (File) file);
+			if (filename == null) filename = ((File) file).getName();
+			multipart.addBinaryBody("file", (File) file, ContentType.APPLICATION_OCTET_STREAM, filename);
 		} else if (file instanceof String) {
 			multipart.addTextBody("file", (String) file);
 		} else if (file instanceof byte[]) {
-			multipart.addBinaryBody("file", (byte[]) file, ContentType.APPLICATION_OCTET_STREAM, "file");
+			if (filename == null) filename = "file";
+			multipart.addBinaryBody("file", (byte[]) file, ContentType.APPLICATION_OCTET_STREAM, filename);
 		} else if (file == null) {
 			// no-problem
 		} else {

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

@@ -413,5 +413,11 @@ public void testUnsignedUpload()  throws Exception {
         assertTrue(result.get("public_id").toString().matches("^upload_folder\\/[a-z0-9]+$"));
         cloudinary.api().deleteUploadPreset(preset.get("name").toString(), ObjectUtils.emptyMap());
     }
+    
+    @Test
+    public void testFilenameOption() throws Exception {
+    	Map result = cloudinary.uploader().upload(SRC_TEST_IMAGE, ObjectUtils.asMap("filename", "emanelif"));
+    	assertEquals("emanelif", result.get("original_filename"));
+    }
 
 }