Add deleteByToken to Uploader.

Author: nitzanj

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

@@ -45,7 +45,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
             }
         }
 
-        String apiUrl = this.cloudinary().cloudinaryApiUrl(action, options);
+        String apiUrl = buildUploadUrl(action, options);
         MultipartCallback multipartCallback;
         if (progressCallback == null) {
             multipartCallback = null;

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

@@ -109,7 +109,7 @@ public Map uploadLarge(Object file, Map options, int bufferSize) throws IOExcept
         return uploadLarge(file, options, bufferSize, null);
     }
 
-    public Map uploadLarge(Object file, Map options, int bufferSize,  ProgressCallback progressCallback) throws IOException {
+    public Map uploadLarge(Object file, Map options, int bufferSize, ProgressCallback progressCallback) throws IOException {
         InputStream input;
         long length = -1;
         if (file instanceof InputStream) {
@@ -510,4 +510,7 @@ public String imageUploadTag(String field, Map options, Map<String, Object> html
         return builder.toString();
     }
 
+    public Map deleteByToken(String token) throws Exception {
+        return callApi("delete_by_token", ObjectUtils.asMap("token", token), ObjectUtils.emptyMap(), null);
+    }
 }

cloudinary-core/src/main/java/com/cloudinary/strategies/AbstractUploaderStrategy.java

@@ -6,6 +6,8 @@
 import com.cloudinary.Cloudinary;
 import com.cloudinary.ProgressCallback;
 import com.cloudinary.Uploader;
+import com.cloudinary.utils.ObjectUtils;
+import com.cloudinary.utils.StringUtils;
 
 public abstract class AbstractUploaderStrategy {
     protected Uploader uploader;
@@ -19,9 +21,25 @@ public Cloudinary cloudinary() {
     }
 
     @SuppressWarnings("rawtypes")
-    public Map callApi(String action, Map<String, Object> params, Map options, Object file) throws IOException{
+    public Map callApi(String action, Map<String, Object> params, Map options, Object file) throws IOException {
         return callApi(action, params, options, file, null);
     }
 
     public abstract Map callApi(String action, Map<String, Object> params, Map options, Object file, ProgressCallback progressCallback) throws IOException;
-}
+
+    protected String buildUploadUrl(String action, Map options) {
+        String cloudinary = ObjectUtils.asString(options.get("upload_prefix"),
+                ObjectUtils.asString(uploader.cloudinary().config.uploadPrefix, "https://api.cloudinary.com"));
+        String cloud_name = ObjectUtils.asString(options.get("cloud_name"), ObjectUtils.asString(uploader.cloudinary().config.cloudName));
+        if (cloud_name == null)
+            throw new IllegalArgumentException("Must supply cloud_name in tag or in configuration");
+
+        if (action.equals("delete_by_token")) {
+            // the only method (so far) that doesn't need resource_type
+            return StringUtils.join(new String[]{cloudinary, "v1_1", cloud_name, action}, "/");
+        } else {
+            String resource_type = ObjectUtils.asString(options.get("resource_type"), "image");
+            return StringUtils.join(new String[]{cloudinary, "v1_1", cloud_name, resource_type, action}, "/");
+        }
+    }
+}

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

@@ -50,7 +50,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
             Util.clearEmpty(params);
         }
 
-        String apiUrl = uploader.cloudinary().cloudinaryApiUrl(action, options);
+        String apiUrl = buildUploadUrl(action, options);
 
         ClientConnectionManager connectionManager = (ClientConnectionManager) this.uploader.cloudinary().config.properties.get("connectionManager");
         HttpClient client = new DefaultHttpClient(connectionManager);

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

@@ -73,7 +73,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
             Util.clearEmpty(params);
         }
 
-        String apiUrl = uploader.cloudinary().cloudinaryApiUrl(action, options);
+        String apiUrl = buildUploadUrl(action, options);
 
         HttpPost postMethod = new HttpPost(apiUrl);
         ApiUtils.setTimeouts(postMethod, options);

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

@@ -73,7 +73,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
             Util.clearEmpty(params);
         }
 
-        String apiUrl = uploader.cloudinary().cloudinaryApiUrl(action, options);
+        String apiUrl = buildUploadUrl(action, options);
 
         HttpPost postMethod = new HttpPost(apiUrl);
         ApiUtils.setTimeouts(postMethod, options);

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

@@ -78,6 +78,16 @@ public void testUtf8Upload() throws IOException {
         assertEquals(result.get("signature"), expected_signature);
     }
 
+    @Test
+    public void testDeleteByToken() throws Exception {
+        Map options = ObjectUtils.asMap("return_delete_token", true, "tags", new String[]{SDK_TEST_TAG, uniqueTag});
+        Map res = cloudinary.uploader().upload(SRC_TEST_IMAGE, options);
+        String token = (String) res.get("delete_token");
+        res = cloudinary.uploader().deleteByToken(token);
+        assertNotNull(res);
+        assertEquals("ok", res.get("result"));
+    }
+
     @Test
     public void testUpload() throws IOException {
         Map result = cloudinary.uploader().upload(SRC_TEST_IMAGE, asMap("colors", true, "tags", SDK_TEST_TAG));