Add analyze api

Author: adimiz1

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

@@ -779,6 +779,17 @@ public ApiResponse reorderMetadataFields(String orderBy, String direction, Map o
         return callApi(HttpMethod.PUT, uri, map, options);
     }
 
+    public ApiResponse analyze(String inputType, String analysisType, String uri, Map options) throws Exception {
+        if (options == null || options.isEmpty()) options = ObjectUtils.asMap();
+        List<String> url = Arrays.asList("analysis", "analyze", inputType);
+        options.put("api_version", "v2");
+        options.put("content_type", "json");
+        final Map params = new HashMap();
+        params.put("analysis_type", analysisType);
+        params.put("uri", uri);
+        return callApi(HttpMethod.POST, url, params, options);
+    }
+
     private Map<String, ?> extractParams(Map options, List<String> keys) {
         Map<String, Object> result = new HashMap<String, Object>();
         for (String key : keys) {

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

@@ -5,6 +5,7 @@
 import com.cloudinary.SmartUrlEncoder;
 import com.cloudinary.api.ApiResponse;
 import com.cloudinary.utils.Base64Coder;
+import com.cloudinary.utils.ObjectUtils;
 import com.cloudinary.utils.StringUtils;
 import java.util.Arrays;
 import java.util.Map;
@@ -17,9 +18,12 @@ public void init(Api api) {
         this.api = api;
     }
 
-    protected String createApiUrl (Iterable<String> uri, String prefix, String cloudName){
-
-        String apiUrl = StringUtils.join(Arrays.asList(prefix, "v1_1", cloudName), "/");
+    protected String createApiUrl (Iterable<String> uri, Map options){
+        String version = ObjectUtils.asString(options.get("api_version"), "v1_1");
+        String prefix = ObjectUtils.asString(options.get("upload_prefix"), ObjectUtils.asString(this.api.cloudinary.config.uploadPrefix, "https://api.cloudinary.com"));
+        String cloudName = ObjectUtils.asString(options.get("cloud_name"), this.api.cloudinary.config.cloudName);
+        if (cloudName == null) throw new IllegalArgumentException("Must supply cloud_name");
+        String apiUrl = StringUtils.join(Arrays.asList(prefix, version, cloudName), "/");
         for (String component : uri) {
             component = SmartUrlEncoder.encode(component);
             apiUrl = apiUrl + "/" + component;

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

@@ -34,17 +34,14 @@ public class ApiStrategy extends AbstractApiStrategy {
     public ApiResponse callApi(HttpMethod method, Iterable<String> uri, Map<String, ? extends Object> params, Map options) throws Exception {
         if (options == null) options = ObjectUtils.emptyMap();
 
-        String prefix = ObjectUtils.asString(options.get("upload_prefix"), ObjectUtils.asString(this.api.cloudinary.config.uploadPrefix, "https://api.cloudinary.com"));
-        String cloudName = ObjectUtils.asString(options.get("cloud_name"), this.api.cloudinary.config.cloudName);
-        if (cloudName == null) throw new IllegalArgumentException("Must supply cloud_name");
         String apiKey = ObjectUtils.asString(options.get("api_key"), this.api.cloudinary.config.apiKey);
         String apiSecret = ObjectUtils.asString(options.get("api_secret"), this.api.cloudinary.config.apiSecret);
         String oauthToken = ObjectUtils.asString(options.get("oauth_token"), this.api.cloudinary.config.oauthToken);
         String contentType = ObjectUtils.asString(options.get("content_type"), "urlencoded");
         int timeout = ObjectUtils.asInteger(options.get("timeout"), this.api.cloudinary.config.timeout);
         validateAuthorization(apiKey, apiSecret, oauthToken);
 
-        String apiUrl = createApiUrl(uri, prefix, cloudName);
+        String apiUrl = createApiUrl(uri, options);
 
         return getApiResponse(method, params, apiKey, apiSecret, oauthToken, contentType, timeout, apiUrl);
     }

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

@@ -77,16 +77,13 @@ public ApiResponse callApi(HttpMethod method, Iterable<String> uri, Map<String,
         if (options == null)
             options = ObjectUtils.emptyMap();
 
-        String prefix = ObjectUtils.asString(options.get("upload_prefix"), ObjectUtils.asString(this.api.cloudinary.config.uploadPrefix, "https://api.cloudinary.com"));
-        String cloudName = ObjectUtils.asString(options.get("cloud_name"), this.api.cloudinary.config.cloudName);
-        if (cloudName == null) throw new IllegalArgumentException("Must supply cloud_name");
         String apiKey = ObjectUtils.asString(options.get("api_key"), this.api.cloudinary.config.apiKey);
         String apiSecret = ObjectUtils.asString(options.get("api_secret"), this.api.cloudinary.config.apiSecret);
         String oauthToken = ObjectUtils.asString(options.get("oauth_token"), this.api.cloudinary.config.oauthToken);
 
         validateAuthorization(apiKey, apiSecret, oauthToken);
 
-        String apiUrl = createApiUrl(uri, prefix, cloudName);
+        String apiUrl = createApiUrl(uri, options);
         HttpUriRequest request = prepareRequest(method, apiUrl, params, options);
 
         request.setHeader("Authorization", getAuthorizationHeaderValue(apiKey, apiSecret, oauthToken));

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

@@ -79,16 +79,13 @@ public ApiResponse callApi(HttpMethod method, Iterable<String> uri, Map<String,
         if (options == null)
             options = ObjectUtils.emptyMap();
 
-        String prefix = ObjectUtils.asString(options.get("upload_prefix"), ObjectUtils.asString(this.api.cloudinary.config.uploadPrefix, "https://api.cloudinary.com"));
-        String cloudName = ObjectUtils.asString(options.get("cloud_name"), this.api.cloudinary.config.cloudName);
-        if (cloudName == null) throw new IllegalArgumentException("Must supply cloud_name");
         String apiKey = ObjectUtils.asString(options.get("api_key"), this.api.cloudinary.config.apiKey);
         String apiSecret = ObjectUtils.asString(options.get("api_secret"), this.api.cloudinary.config.apiSecret);
         String oauthToken = ObjectUtils.asString(options.get("oauth_token"), this.api.cloudinary.config.oauthToken);
 
         validateAuthorization(apiKey, apiSecret, oauthToken);
 
-        String apiUrl = createApiUrl(uri, prefix, cloudName);
+        String apiUrl = createApiUrl(uri, options);
         HttpUriRequest request = prepareRequest(method, apiUrl, params, options);
 
         request.setHeader("Authorization", getAuthorizationHeaderValue(apiKey, apiSecret, oauthToken));

cloudinary-http45/src/main/java/com/cloudinary/http45/ApiStrategy.java

@@ -77,17 +77,13 @@ public ApiResponse callApi(HttpMethod method, Iterable<String> uri, Map<String,
         if (options == null)
             options = ObjectUtils.emptyMap();
 
-        String prefix = ObjectUtils.asString(options.get("upload_prefix"), ObjectUtils.asString(this.api.cloudinary.config.uploadPrefix, "https://api.cloudinary.com"));
-        String cloudName = ObjectUtils.asString(options.get("cloud_name"), this.api.cloudinary.config.cloudName);
-        if (cloudName == null) throw new IllegalArgumentException("Must supply cloud_name");
         String apiKey = ObjectUtils.asString(options.get("api_key"), this.api.cloudinary.config.apiKey);
         String apiSecret = ObjectUtils.asString(options.get("api_secret"), this.api.cloudinary.config.apiSecret);
         String oauthToken = ObjectUtils.asString(options.get("oauth_token"), this.api.cloudinary.config.oauthToken);
 
         validateAuthorization(apiKey, apiSecret, oauthToken);
 
-
-        String apiUrl = createApiUrl(uri, prefix, cloudName);
+        String apiUrl = createApiUrl(uri, options);
         HttpUriRequest request = prepareRequest(method, apiUrl, params, options);
 
         request.setHeader("Authorization", getAuthorizationHeaderValue(apiKey, apiSecret, oauthToken));

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

@@ -1238,6 +1238,14 @@ public void testAccessibilityAnalysisResource() throws Exception {
         assertNotNull(res.get("accessibility_analysis"));
     }
 
+    @Test
+    public void testAnalyzeApi() throws Exception {
+        assumeAddonEnabled("captioning");
+        ApiResponse res = api.analyze("uri", "captioning", "https://res.cloudinary.com/demo/image/upload/dog", ObjectUtils.emptyMap());
+        assertNotNull(res);
+        assertNotNull(res.get("request_id"));
+    }
+
     @Test
     public void testFolderDecoupling() {
         //TODO: Need to build a unit testing infrastructure