stop using AbstractUrlBuilderStrategy. use URLEncoder instead

Author: itaibenari

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

@@ -3,6 +3,7 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URLDecoder;
+import java.net.URLEncoder;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
@@ -190,12 +191,7 @@ public String privateDownload(String publicId, String format, Map<String, Object
 		params.put("type", options.get("type"));
 		params.put("timestamp", new Long(System.currentTimeMillis() / 1000L).toString());
 		signRequest(params, options);
-		AbstractUrlBuilderStrategy builder=  urlBuilderStrategy.init(cloudinaryApiUrl("download", options));
-
-		for (Map.Entry<String, Object> param : params.entrySet()) {
-			builder.addParam(param.getKey(), param.getValue().toString());
-		}
-		return builder.url();
+		return buildUrl(cloudinaryApiUrl("download", options), params);
 	}
 
 	public String zipDownload(String tag, Map<String, Object> options) throws Exception {
@@ -211,11 +207,23 @@ public String zipDownload(String tag, Map<String, Object> options) throws Except
 		}
 		params.put("transformation", transformation);
 		signRequest(params, options);
-		AbstractUrlBuilderStrategy builder=  urlBuilderStrategy.init(cloudinaryApiUrl("download_tag.zip", options));
+		return buildUrl(cloudinaryApiUrl("download_tag.zip", options), params);
+	}
+	
+	private String buildUrl(String base, Map<String, Object> params) throws UnsupportedEncodingException {
+		StringBuilder urlBuilder = new StringBuilder();
+		urlBuilder.append(base);
+		if (!params.isEmpty()) {
+			urlBuilder.append("?");
+		}
+		boolean first = true;
 		for (Map.Entry<String, Object> param : params.entrySet()) {
-			builder.addParam(param.getKey(), param.getValue().toString());
+			if (!first) urlBuilder.append("&");
+			urlBuilder.append(param.getKey()).append("=").append(
+				URLEncoder.encode(param.getValue().toString(), "UTF-8"));
+			first = false;
 		}
-		return builder.url();
+		return urlBuilder.toString();
 	}
 
 	protected Map parseConfigUrl(String cloudinaryUrl) {

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

@@ -402,10 +402,10 @@ public void testShorten() {
 	@SuppressWarnings("unchecked")
 	@Test
 	public void testPrivateDownload() throws Exception {
-		String url = cloudinary.privateDownload("img", "jpg", ObjectUtils.emptyMap());
+		String url = cloudinary.privateDownload("imgÿ=&é", "jpg", ObjectUtils.emptyMap());
 		URI uri = new URI(url);
 		Map<String, String> parameters = getUrlParameters(uri);
-		assertEquals("img", parameters.get("public_id"));
+		assertEquals("imgÿ=&é", parameters.get("public_id"));
 		assertEquals("jpg", parameters.get("format"));
 		assertEquals("a", parameters.get("api_key"));
 		assertEquals("/v1_1/test123/image/download", uri.getPath());
@@ -577,7 +577,7 @@ public void testUtils() {
 
 	public static Map<String, String> getUrlParameters(URI uri) throws UnsupportedEncodingException {
 		Map<String, String> params = new HashMap<String, String>();
-		for (String param : uri.getQuery().split("&")) {
+		for (String param : uri.getRawQuery().split("&")) {
 			String pair[] = param.split("=");
 			String key = URLDecoder.decode(pair[0], "UTF-8");
 			String value = "";