Merge branch 'feature/publish-api'

# Conflicts:
#	cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractApiTest.java

Author: Amir Tocker

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

@@ -275,4 +275,39 @@ public ApiResponse createUploadMapping(String name, Map options) throws Exceptio
         return callApi(HttpMethod.POST, Arrays.asList("upload_mappings"), params, options);
     }
 
+    public ApiResponse publishByPrefix(String prefix, Map options) throws Exception {
+        if (options == null) options = ObjectUtils.emptyMap();
+        String resourceType = ObjectUtils.asString(options.get("resource_type"), "image");
+        List<String> uri = new ArrayList<String>();
+        uri.add("publish_resources");
+        uri.add(resourceType);
+        Map params = new HashMap<String, Object>();
+        params.put("prefix", prefix);
+        params.putAll(ObjectUtils.only(options, "invalidate", "overwrite"));
+        return callApi(HttpMethod.POST, uri, params, options);
+    }
+
+    public ApiResponse publishByTag(String tag, Map options) throws Exception {
+        if (options == null) options = ObjectUtils.emptyMap();
+        String resourceType = ObjectUtils.asString(options.get("resource_type"), "image");
+        List<String> uri = new ArrayList<String>();
+        uri.add("publish_resources");
+        uri.add(resourceType);
+        Map params = new HashMap<String, Object>();
+        params.put("tag", tag);
+        params.putAll(ObjectUtils.only(options, "invalidate", "overwrite"));
+        return callApi(HttpMethod.POST, uri, params, options);
+    }
+
+    public ApiResponse publishByIds(Iterable<String> publicIds, Map options) throws Exception {
+        if (options == null) options = ObjectUtils.emptyMap();
+        String resourceType = ObjectUtils.asString(options.get("resource_type"), "image");
+        List<String> uri = new ArrayList<String>();
+        uri.add("publish_resources");
+        uri.add(resourceType);
+        Map params = new HashMap<String, Object>();
+        params.put("public_ids", publicIds);
+        params.putAll(ObjectUtils.only(options, "invalidate", "overwrite"));
+        return callApi(HttpMethod.POST, uri, params, options);
+    }
 }

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

@@ -165,6 +165,7 @@ public Map rename(String fromPublicId, String toPublicId, Map options) throws IO
         params.put("from_public_id", fromPublicId);
         params.put("to_public_id", toPublicId);
         params.put("invalidate", ObjectUtils.asBoolean(options.get("invalidate"), false).toString());
+        params.put("to_type", options.get("to_type"));
         return callApi("rename", params, options, null);
     }
 

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

@@ -697,4 +697,46 @@ public void testUploadMapping() throws Exception {
         }
         assertTrue(!found);
     }
+
+    @Test
+    public void testPublishByIds() throws Exception {
+        Map response = cloudinary.uploader().upload(SRC_TEST_IMAGE, ObjectUtils.asMap("tags", SDK_TEST_TAG, "type", "authenticated"));
+        String publicId = (String) response.get("public_id");
+        response = cloudinary.api().publishByIds(Arrays.asList(publicId), null);
+        List published = (List) response.get("published");
+        assertNotNull(published);
+        assertEquals(published.size(), 1);
+        Map resource = (Map) published.get(0);
+        assertEquals(resource.get("public_id"), publicId);
+        assertNotNull(resource.get("url"));
+        cloudinary.uploader().destroy(publicId, null);
+    }
+
+    @Test
+    public void testPublishByPrefix() throws Exception {
+        Map response = cloudinary.uploader().upload(SRC_TEST_IMAGE, ObjectUtils.asMap("tags", SDK_TEST_TAG, "type", "authenticated"));
+        String publicId = (String) response.get("public_id");
+        response = cloudinary.api().publishByPrefix(publicId.substring(0, publicId.length() - 2), null);
+        List published = (List) response.get("published");
+        assertNotNull(published);
+        assertEquals(published.size(), 1);
+        Map resource = (Map) published.get(0);
+        assertEquals(resource.get("public_id"), publicId);
+        assertNotNull(resource.get("url"));
+        cloudinary.uploader().destroy(publicId, null);
+    }
+
+    @Test
+    public void testPublishByTag() throws Exception {
+        Map response = cloudinary.uploader().upload(SRC_TEST_IMAGE, ObjectUtils.asMap("tags", Arrays.asList(SDK_TEST_TAG, SDK_TEST_TAG + "1"), "type", "authenticated"));
+        String publicId = (String) response.get("public_id");
+        response = cloudinary.api().publishByTag(SDK_TEST_TAG + "1", null);
+        List published = (List) response.get("published");
+        assertNotNull(published);
+        assertEquals(published.size(), 1);
+        Map resource = (Map) published.get(0);
+        assertEquals(resource.get("public_id"), publicId);
+        assertNotNull(resource.get("url"));
+        cloudinary.uploader().destroy(publicId, null);
+    }
 }