support upload mappings api. add missing restore test

Author: itaibenari

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

@@ -236,5 +236,42 @@ public ApiResponse restore(Iterable<String> publicIds, Map options) throws Excep
 		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);
+	}
 
 }

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

@@ -15,6 +15,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.ListIterator;
 import java.util.Map;
 
 import org.junit.Before;
@@ -640,6 +641,66 @@ public void testFolderApi() throws Exception {
 		}
 		api.deleteResourcesByPrefix("test_folder", ObjectUtils.emptyMap());
 	}
+	
+	@Test
+	public void testRestore() throws Exception {
+		// should support restoring resources
+		cloudinary.uploader().upload(SRC_TEST_IMAGE,
+				ObjectUtils.asMap("public_id", "api_test_restore", "backup", true));
+		Map resource = api.resource("api_test_restore", ObjectUtils.emptyMap());
+		assertEquals(resource.get("bytes"), 3381);
+		api.deleteResources(Arrays.asList("api_test_restore"), ObjectUtils.emptyMap());
+		resource = api.resource("api_test_restore", ObjectUtils.emptyMap());
+		assertEquals(resource.get("bytes"), 0);
+		assertTrue((Boolean) resource.get("placeholder"));
+		Map response = api.restore(Arrays.asList("api_test_restore"), ObjectUtils.emptyMap());
+		Map info = (Map) response.get("api_test_restore");
+		assertNotNull(info);
+		assertEquals(info.get("bytes"), 3381);
+		resource = api.resource("api_test_restore", ObjectUtils.emptyMap());
+		assertEquals(resource.get("bytes"), 3381);
+	}
+
+	@Test
+	public void testUploadMapping() throws Exception {
+		try {
+			api.deleteUploadMapping("api_test_upload_mapping", ObjectUtils.emptyMap());
+		} catch (Exception e) {
+
+		}
+		api.createUploadMapping("api_test_upload_mapping", ObjectUtils.asMap("template", "http://cloudinary.com"));
+		Map result = api.uploadMapping("api_test_upload_mapping", ObjectUtils.emptyMap());
+		assertEquals(result.get("template"), "http://cloudinary.com");
+		api.updateUploadMapping("api_test_upload_mapping", ObjectUtils.asMap("template", "http://res.cloudinary.com"));
+		result = api.uploadMapping("api_test_upload_mapping", ObjectUtils.emptyMap());
+		assertEquals(result.get("template"), "http://res.cloudinary.com");
+		result = api.uploadMappings(ObjectUtils.emptyMap());
+		ListIterator mappings = ((ArrayList) result.get("mappings")).listIterator();
+		boolean found = false;
+		while (mappings.hasNext()) {
+			Map mapping = (Map) mappings.next();
+			if (mapping.get("folder").equals("api_test_upload_mapping")
+					&& mapping.get("template").equals("http://res.cloudinary.com")) {
+				found = true;
+				break;
+			}
+		}
+		assertTrue(found);
+		api.deleteUploadMapping("api_test_upload_mapping", ObjectUtils.emptyMap());
+		result = api.uploadMappings(ObjectUtils.emptyMap());
+		found = false;
+		while (mappings.hasNext()) {
+			Map mapping = (Map) mappings.next();
+			if (mapping.get("folder").equals("api_test_upload_mapping")
+					&& mapping.get("template").equals("http://res.cloudinary.com")) {
+				found = true;
+				break;
+			}
+		}
+		assertTrue(!found);
+	}
+
+
 
 	private void assertContains(Object object, Collection list) {
 		assertTrue(list.contains(object));