Encode URLs in API calls (#186)

Author: michalkcloudinay

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

@@ -2,17 +2,31 @@
 
 import com.cloudinary.Api;
 import com.cloudinary.Api.HttpMethod;
+import com.cloudinary.SmartUrlEncoder;
 import com.cloudinary.api.ApiResponse;
-
+import com.cloudinary.utils.StringUtils;
+import java.util.Arrays;
 import java.util.Map;
 
+
 public abstract class AbstractApiStrategy {
     protected Api api;
 
     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), "/");
+        for (String component : uri) {
+            component = SmartUrlEncoder.encode(component);
+            apiUrl = apiUrl + "/" + component;
+
+        }
+            return apiUrl;
+    }
+
     @SuppressWarnings("rawtypes")
     public abstract ApiResponse callApi(HttpMethod method, Iterable<String> uri, Map<String, ? extends Object> params, Map options) throws Exception;
 

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

@@ -43,11 +43,7 @@ public ApiResponse callApi(HttpMethod method, Iterable<String> uri, Map<String,
         if (apiSecret == null) throw new IllegalArgumentException("Must supply api_secret");
         String contentType = ObjectUtils.asString(options.get("content_type"), "urlencoded");
         int timeout = ObjectUtils.asInteger(options.get("timeout"), this.api.cloudinary.config.timeout);
-        String apiUrl = StringUtils.join(Arrays.asList(prefix, "v1_1", cloudName), "/");
-
-        for (String component : uri) {
-            apiUrl = apiUrl + "/" + component;
-        }
+        String apiUrl = createApiUrl(uri, prefix, cloudName);
 
         return getApiResponse(method, params, apiKey, apiSecret, contentType, timeout, apiUrl);
     }

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

@@ -84,10 +84,7 @@ public ApiResponse callApi(HttpMethod method, Iterable<String> uri, Map<String,
         if (apiSecret == null) throw new IllegalArgumentException("Must supply api_secret");
 
 
-        String apiUrl = StringUtils.join(Arrays.asList(prefix, "v1_1", cloudName), "/");
-        for (String component : uri) {
-            apiUrl = apiUrl + "/" + component;
-        }
+        String apiUrl = createApiUrl(uri, prefix, cloudName);
         HttpUriRequest request = prepareRequest(method, apiUrl, params, options);
 
         request.setHeader("Authorization", "Basic " + Base64Coder.encodeString(apiKey + ":" + apiSecret));

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

@@ -86,10 +86,7 @@ public ApiResponse callApi(HttpMethod method, Iterable<String> uri, Map<String,
         if (apiSecret == null) throw new IllegalArgumentException("Must supply api_secret");
 
 
-        String apiUrl = StringUtils.join(Arrays.asList(prefix, "v1_1", cloudName), "/");
-        for (String component : uri) {
-            apiUrl = apiUrl + "/" + component;
-        }
+        String apiUrl = createApiUrl(uri, prefix, cloudName);
         HttpUriRequest request = prepareRequest(method, apiUrl, params, options);
 
         request.setHeader("Authorization", "Basic " + Base64Coder.encodeString(apiKey + ":" + apiSecret));
@@ -204,4 +201,4 @@ private HttpUriRequest prepareRequest(HttpMethod method, String apiUrl, Map<Stri
         setTimeouts(request, options);
         return request;
     }
-}
+}

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

@@ -793,6 +793,14 @@ public void testRestore() throws Exception {
         assertEquals(resource.get("bytes"), 3381);
     }
 
+    @Test
+    public void testEncodeUrlInApiCall() throws Exception {
+        String apiTestEncodeUrlInApiCall = "sub^folder test";
+        createdFolders.add(apiTestEncodeUrlInApiCall);
+        Map result = api.createFolder(apiTestEncodeUrlInApiCall, null);
+        assertEquals("sub^folder test", result.get("path"));
+    }
+
     @Test
     public void testUploadMapping() throws Exception {
         String aptTestUploadMapping = "api_test_upload_mapping" + SUFFIX;