Merge branch 'master' of github.com:cloudinary/cloudinary_java

Author: tocker

CHANGES.txt

@@ -6,4 +6,6 @@
 1.1.1 - 2014-12-18 - Support secure domain sharding. Don't sign version component. Support url suffix and use root path. Support tags in upload large.
 1.1.2 - 2015-01-15 - fix support for string eager parameters
 1.1.3 - 2015-02-24 - Added timeout parameter to admin api and Fixed test and configuration
-1.2.0 - 2015-04-13 - Support httpcomponents 4.4. Support for video tag and transformations. support ftp url upload. support eager_async in explicit. Fix UTF-8 issues in API. Improved parameter support for upload_large.
+1.2.0 - 2015-04-13 - Support httpcomponents 4.4. Support for video tag and transformations. support ftp url upload. support eager_async in explicit. Fix UTF-8 issues in API. Improved parameter support for upload_large.
+1.2.1 - 2015-06-18 - Fix HTML escaping (fixes upload tags). Allow android unsigned upload without api_key. Fix http44 response closing.
+1.2.2 - 2015-10-11 - support apache http 4.3 strategy. support easy overlay/underlay construction. support upload mappings api. support the restore api. normalize user agent. add invalidate flag to rename and explicit. support aspect ratio transformation param. Fix encoding issues when JVM default encoding is not UTF-8. support filename in upload options. close response objects in http44. 

README.md

@@ -14,7 +14,7 @@ Cloudinary provides URL and HTTP based APIs that can be easily integrated with a
 
 For Java, Cloudinary provides a library for simplifying the integration even further.
 
-**Note:** Starting from version 1.1.0, you should depend on cloudinary-http42 for Java and cloudinary-android for Android. The artifact cloudinary is deprecated. From version 1.2.0 cloudinary-http44 is available.
+**Note:** Starting from version 1.1.0, you should depend on cloudinary-http42 for Java and cloudinary-android for Android. The artifact cloudinary is deprecated. From version 1.2.1 cloudinary-http44 is available. From version 1.2.2 cloudinary-http43 is available.
 
 **Note:** This readme intended mainly for Web applications. For **Android** specific instructions, see: https://github.com/cloudinary/cloudinary_java/tree/master/cloudinary-android
 
@@ -28,10 +28,10 @@ The cloudinary_java library is available in [Maven Central](https://repo1.maven.
     <dependency>
         <groupId>com.cloudinary</groupId>
         <artifactId>cloudinary-http44</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.2</version>
     </dependency>
 
-Alternatively, download cloudinary_java from [here](https://repo1.maven.org/maven2/com/cloudinary/cloudinary-core/1.2.0/cloudinary-core-1.2.0.jar) and [here](https://repo1.maven.org/maven2/com/cloudinary/cloudinary-http44/1.2.0/cloudinary-http44-1.2.0.jar)
+Alternatively, download cloudinary_java from [here](https://repo1.maven.org/maven2/com/cloudinary/cloudinary-core/1.2.2/cloudinary-core-1.2.2.jar) and [here](https://repo1.maven.org/maven2/com/cloudinary/cloudinary-http44/1.2.2/cloudinary-http44-1.2.2.jar)
 and see [pom.xml](https://github.com/cloudinary/cloudinary_java/blob/master/cloudinary-http44/pom.xml) for library dependencies.
 
 ## Try it right away
@@ -125,7 +125,7 @@ Assuming you have your Cloudinary configuration parameters defined (`cloud_name`
 
 The following example uploads a local JPG to the cloud: 
 
-    cloudinary.uploader().upload("my_picture.jpg", Cloudinary.emptyMap());
+    cloudinary.uploader().upload("my_picture.jpg", ObjectUtils.emptyMap());
 
 The uploaded image is assigned a randomly generated public ID. The image is immediately available for download through a CDN:
 

cloudinary-android-test/pom.xml

@@ -5,12 +5,12 @@
   <parent>
     <groupId>com.cloudinary</groupId>
     <artifactId>cloudinary-parent</artifactId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
 
   <groupId>com.cloudinary</groupId>
   <artifactId>cloudinary-android-test</artifactId>
-  <version>1.2.1-SNAPSHOT</version>
+  <version>1.2.3-SNAPSHOT</version>
   <packaging>apk</packaging>
   <name>Cloudinary Android Test Project</name>
 
@@ -19,7 +19,7 @@
       <groupId>com.cloudinary</groupId>
       <artifactId>cloudinary-android</artifactId>
       <type>jar</type>
-      <version>1.2.1-SNAPSHOT</version>
+      <version>1.2.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.google.android</groupId>

cloudinary-android-test/src/main/java/com/cloudinary/test/UploaderTest.java

@@ -6,13 +6,16 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.cloudinary.json.JSONArray;
 import org.cloudinary.json.JSONObject;
+import org.junit.Test;
 
 import android.test.InstrumentationTestCase;
 import android.util.Log;
@@ -323,6 +326,21 @@ public void testAutoTaggingRequest() {
 		}
 	}
 
+	@Test
+	public void testFilenameOption() throws Exception {
+		JSONObject result = new JSONObject(cloudinary.uploader().upload(getAssetStream(TEST_IMAGE), ObjectUtils.asMap("filename", "emanelif")));
+		assertEquals("emanelif", result.getString("original_filename"));
+	}
+	
+	@Test
+	public void testComplexFilenameOption() throws Exception {
+		String complexFilename = "Universal Image Loader @#&=+-_.,!()~'%20.png";
+		JSONObject result = new JSONObject(cloudinary.uploader().upload(getAssetStream(TEST_IMAGE), ObjectUtils.asMap("filename", complexFilename)));
+		complexFilename = URLEncoder.encode(URLDecoder.decode(complexFilename, "ASCII"), "UTF-8").replace("+", " ").replace(".png", "");
+
+		assertEquals(complexFilename, result.getString("original_filename"));
+	}
+	
 	@SuppressWarnings("unchecked")
 	public void testUploadLarge() throws Exception {
     	// support uploading large files

cloudinary-android/README.md

@@ -14,16 +14,15 @@ Cloudinary provides URL and HTTP based APIs that can be easily integrated with a
 For Android, Cloudinary provides a library for simplifying the integration even further. The library requires Android 2.3 or higher.
 
 ## Manual Setup ######################################################################
-Download cloudinary-core-1.1.0.jar from [here](http://search.maven.org/remotecontent?filepath=com/cloudinary/cloudinary/1.1.0/cloudinary-core-1.1.0.jar) and cloudinary-android-1.1.0.jar from [here](http://search.maven.org/remotecontent?filepath=com/cloudinary/cloudinary/1.1.0/cloudinary-android-1.1.0.jar)
-and put them in your libs folder.
+Download cloudinary-core-1.2.2.jar from [here](http://search.maven.org/remotecontent?filepath=com/cloudinary/cloudinary-core/1.2.2/cloudinary-core-1.2.2.jar) and cloudinary-android-1.2.2.jar from [here](http://search.maven.org/remotecontent?filepath=com/cloudinary/cloudinary-android/1.2.2/cloudinary-android-1.2.2.jar) and put them in your libs folder.
 
 ## Maven Integration ######################################################################
 The cloudinary_java library is available in [Maven Central](http://repo1.maven.org/maven/). To use it, add the following dependency to your pom.xml:
 
     <dependency>
         <groupId>com.cloudinary</groupId>
         <artifactId>cloudinary-android</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.2</version>
     </dependency>
 
 
@@ -129,7 +128,7 @@ Assuming you have your Cloudinary configuration parameters defined (`cloud_name`
 
 The following example uploads a local JPG available as an InputStream to the cloud: 
 
-    cloudinary.uploader().upload(inputStream, Cloudinary.emptyMap())
+    cloudinary.uploader().upload(inputStream, ObjectUtils.emptyMap())
 
 The uploaded image is assigned a randomly generated public ID. The image is immediately available for download through a CDN:
 
@@ -139,7 +138,7 @@ The uploaded image is assigned a randomly generated public ID. The image is imme
 
 You can also specify your own public ID:    
 
-    cloudinary.uploader().upload("http://www.example.com/image.jpg", Cloudinary.asMap("public_id", "sample_remote"))
+    cloudinary.uploader().upload("http://www.example.com/image.jpg", ObjectUtils.asMap("public_id", "sample_remote"))
 
     cloudinary.url().generate("sample_remote.jpg")
 
@@ -173,7 +172,7 @@ Your server can use any Cloudinary libraries (Ruby on Rails, PHP, Python & Djang
 
 The following code uploads an image to Cloudinary with the parameters generated safely on the server side (e.g., from a JSON as in the example above):
 
-    cloudinary.uploader().upload(inputStream, Cloudinary.asMap("public_id", publicId, "signature", signature, "timestamp", timestamp, "api_key", api_key))
+    cloudinary.uploader().upload(inputStream, ObjectUtils.asMap("public_id", publicId, "signature", signature, "timestamp", timestamp, "api_key", api_key))
 
 You might want to reference uploaded Cloudinary images and raw files using an identifier string of the following format:
 

cloudinary-android/pom.xml

@@ -10,7 +10,7 @@
   <parent>
     <groupId>com.cloudinary</groupId>
     <artifactId>cloudinary-parent</artifactId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>cloudinary-android</artifactId>

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

@@ -23,12 +23,13 @@
 public class MultipartUtility {
 	private final String boundary;
 	private static final String LINE_FEED = "\r\n";
+	private static final String APPLICATION_OCTET_STREAM = "application/octet-stream";
 	private HttpURLConnection httpConn;
 	private String charset;
 	private OutputStream outputStream;
 	private PrintWriter writer;
 
-	public final static String USER_AGENT = "cld-android-" + Cloudinary.VERSION;
+	public final static String USER_AGENT = "CloudinaryAndroid/" + Cloudinary.VERSION;
 
 
 	/**
@@ -84,16 +85,21 @@ 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);
+		writer.append("Content-Type: ").append(APPLICATION_OCTET_STREAM).append(LINE_FEED);
 		writer.append("Content-Transfer-Encoding: binary").append(LINE_FEED);
 		writer.append(LINE_FEED);
 		writer.flush();

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

@@ -27,23 +27,24 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
 		}
 		boolean returnError = ObjectUtils.asBoolean(options.get("return_error"), false);
 
-		String apiKey = ObjectUtils.asString(options.get("api_key"), this.cloudinary().config.apiKey);
-		if (apiKey == null)
-			throw new IllegalArgumentException("Must supply api_key");
-
 		if (Boolean.TRUE.equals(options.get("unsigned"))) {
 			// Nothing to do
-		} else if (options.containsKey("signature") && options.containsKey("timestamp")) {
-			params.put("timestamp", options.get("timestamp"));
-			params.put("signature", options.get("signature"));
-			params.put("api_key", apiKey);
 		} else {
-			String apiSecret = ObjectUtils.asString(options.get("api_secret"), this.cloudinary().config.apiSecret);
-			if (apiSecret == null)
-				throw new IllegalArgumentException("Must supply api_secret");
-			params.put("timestamp", Long.valueOf(System.currentTimeMillis() / 1000L).toString());
-			params.put("signature", this.cloudinary().apiSignRequest(params, apiSecret));
-			params.put("api_key", apiKey);
+			String apiKey = ObjectUtils.asString(options.get("api_key"), this.cloudinary().config.apiKey);
+			if (apiKey == null)
+				throw new IllegalArgumentException("Must supply api_key");
+			if (options.containsKey("signature") && options.containsKey("timestamp")) {
+				params.put("timestamp", options.get("timestamp"));
+				params.put("signature", options.get("signature"));
+				params.put("api_key", apiKey);
+			} else {
+				String apiSecret = ObjectUtils.asString(options.get("api_secret"), this.cloudinary().config.apiSecret);
+				if (apiSecret == null)
+					throw new IllegalArgumentException("Must supply api_secret");
+				params.put("timestamp", Long.valueOf(System.currentTimeMillis() / 1000L).toString());
+				params.put("signature", this.cloudinary().apiSignRequest(params, apiSecret));
+				params.put("api_key", apiKey);
+			}
 		}
 		String apiUrl = this.cloudinary().cloudinaryApiUrl(action, options);
 		MultipartUtility multipart = new MultipartUtility(apiUrl, "UTF-8", this.cloudinary().randomPublicId(), (String) options.get("content_range"));
@@ -64,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-core/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.cloudinary</groupId>
         <artifactId>cloudinary-parent</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>cloudinary-core</artifactId>

cloudinary-core/src/main/java/com/cloudinary/Api.java

@@ -226,5 +226,52 @@ public ApiResponse subFolders(String ofFolderPath, Map options) throws Exception
 			options = ObjectUtils.emptyMap();
 		return callApi(HttpMethod.GET, Arrays.asList("folders", ofFolderPath), ObjectUtils.emptyMap(), options);
 	}
+
+	public ApiResponse restore(Iterable<String> publicIds, Map options) throws Exception {
+		if (options == null)
+			options = ObjectUtils.emptyMap();
+		String resourceType = ObjectUtils.asString(options.get("resource_type"), "image");
+		String type = ObjectUtils.asString(options.get("type"), "upload");
+		Map params = new HashMap<String, Object>();
+		params.put("public_ids", publicIds);
+		return callApi(HttpMethod.POST, Arrays.asList("resources", resourceType, type, "restore"), params, options);
+	}
+	
+	public ApiResponse uploadMappings(Map options) throws Exception {
+		if (options == null)
+			options = ObjectUtils.emptyMap();
+		return callApi(HttpMethod.GET, Arrays.asList("upload_mappings"),
+				ObjectUtils.only(options, "next_cursor", "max_results"), options);
+	}
+
+	public ApiResponse uploadMapping(String name, Map options) throws Exception {
+		if (options == null)
+			options = ObjectUtils.emptyMap();
+		return callApi(HttpMethod.GET, Arrays.asList("upload_mappings"), ObjectUtils.asMap("folder", name), options);
+	}
+
+	public ApiResponse deleteUploadMapping(String name, Map options) throws Exception {
+		if (options == null)
+			options = ObjectUtils.emptyMap();
+		return callApi(HttpMethod.DELETE, Arrays.asList("upload_mappings"), ObjectUtils.asMap("folder", name), options);
+	}
+
+	public ApiResponse updateUploadMapping(String name, Map options) throws Exception {
+		if (options == null)
+			options = ObjectUtils.emptyMap();
+		Map params = new HashMap<String, Object>();
+		params.put("folder", name);
+		params.putAll(ObjectUtils.only(options, "template"));
+		return callApi(HttpMethod.PUT, Arrays.asList("upload_mappings"), params, options);
+	}
+
+	public ApiResponse createUploadMapping(String name, Map options) throws Exception {
+		if (options == null)
+			options = ObjectUtils.emptyMap();
+		Map params = new HashMap<String, Object>();
+		params.put("folder", name);
+		params.putAll(ObjectUtils.only(options, "template"));
+		return callApi(HttpMethod.POST, Arrays.asList("upload_mappings"), params, options);
+	}
 
 }