support setting context in explicit

itaibenari · itaibenari · commit 13b49778f6a7 · 2014-01-27T17:36:00.000+02:00
diff --git a/cloudinary-core/src/main/java/com/cloudinary/Uploader.java b/cloudinary-core/src/main/java/com/cloudinary/Uploader.java
@@ -108,6 +108,9 @@ public Map explicit(String publicId, Map options) throws IOException {
 		if (options.get("face_coordinates") != null) {
 			params.put("face_coordinates", options.get("face_coordinates").toString());
 		}
+		if (options.get("context") != null) {
+			params.put("context", Cloudinary.encodeMap(options.get("context")));
+		}
 		return callApi("explicit", params, options, null);
 	}
 
diff --git a/cloudinary-core/src/test/java/com/cloudinary/test/UploaderTest.java b/cloudinary-core/src/test/java/com/cloudinary/test/UploaderTest.java
@@ -266,5 +266,9 @@ public void testContext() throws Exception {
     	Map result = cloudinary.uploader().upload("src/test/resources/logo.png", Cloudinary.asMap("context", context));
     	Map info = cloudinary.api().resource((String) result.get("public_id"), Cloudinary.asMap("context", true));
     	assertEquals(Cloudinary.asMap("custom", context), info.get("context"));
+    	Map differentContext = Cloudinary.asMap("caption", "different caption", "alt2", "alternative alternative");
+    	cloudinary.uploader().explicit((String) result.get("public_id"), Cloudinary.asMap("type", "upload", "context", differentContext));
+    	info = cloudinary.api().resource((String) result.get("public_id"), Cloudinary.asMap("context", true));
+    	assertEquals(Cloudinary.asMap("custom", differentContext), info.get("context"));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,9 @@ public Map explicit(String publicId, Map options) throws IOException {`
`108`	`108`	`if (options.get("face_coordinates") != null) {`
`109`	`109`	`params.put("face_coordinates", options.get("face_coordinates").toString());`
`110`	`110`	`}`
	`111`	`+ if (options.get("context") != null) {`
	`112`	`+ params.put("context", Cloudinary.encodeMap(options.get("context")));`
	`113`	`+ }`
`111`	`114`	`return callApi("explicit", params, options, null);`
`112`	`115`	`}`
`113`	`116`
Original file line number	Diff line number	Diff line change
`@@ -266,5 +266,9 @@ public void testContext() throws Exception {`
`266`	`266`	`Map result = cloudinary.uploader().upload("src/test/resources/logo.png", Cloudinary.asMap("context", context));`
`267`	`267`	`Map info = cloudinary.api().resource((String) result.get("public_id"), Cloudinary.asMap("context", true));`
`268`	`268`	`assertEquals(Cloudinary.asMap("custom", context), info.get("context"));`
	`269`	`+ Map differentContext = Cloudinary.asMap("caption", "different caption", "alt2", "alternative alternative");`
	`270`	`+ cloudinary.uploader().explicit((String) result.get("public_id"), Cloudinary.asMap("type", "upload", "context", differentContext));`
	`271`	`+ info = cloudinary.api().resource((String) result.get("public_id"), Cloudinary.asMap("context", true));`
	`272`	`+ assertEquals(Cloudinary.asMap("custom", differentContext), info.get("context"));`
`269`	`273`	`}`
`270`	`274`	`}`