refactor Map encoding for upload

itaibenari · itaibenari · commit b67eaf44aa42 · 2014-01-07T20:27:37.000+02:00
diff --git a/cloudinary-core/src/main/java/com/cloudinary/Cloudinary.java b/cloudinary-core/src/main/java/com/cloudinary/Cloudinary.java
@@ -12,6 +12,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -249,4 +250,19 @@ public static Map asMap(Object...values) {
 	public static Map emptyMap() {
 		return Collections.EMPTY_MAP;
 	}
+	
+	public static String encodeMap(Object arg) {
+		if (arg != null && arg instanceof Map) {
+			Map<String,String> mapArg = (Map<String,String>) arg;
+			HashSet out = new HashSet();
+			for (Map.Entry<String, String> entry : mapArg.entrySet()) {
+				out.add(entry.getKey() + "=" + entry.getValue());
+			}
+			return StringUtils.join(out.toArray(), "|");
+		} else if (arg == null) {
+			return null;
+		} else {
+			return arg.toString();
+		}
+	}
 }
diff --git a/cloudinary-core/src/main/java/com/cloudinary/Uploader.java b/cloudinary-core/src/main/java/com/cloudinary/Uploader.java
@@ -67,19 +67,7 @@ public Map<String, Object> buildUploadParams(Map options) {
 			params.put("face_coordinates", options.get("face_coordinates").toString());
 		}
 		params.put("allowed_formats", StringUtils.join(Cloudinary.asArray(options.get("allowed_formats")), ","));
-		Map<String,String> inputContext = null;
-		if (options.get("context") != null && options.get("context") instanceof Map) {
-			inputContext = ((Map<String,String>) options.get("context"));
-		}
-		if (inputContext != null) {
-			HashSet context = new HashSet();
-			for (Map.Entry<String, String> entry : inputContext.entrySet()) {
-				context.add(entry.getKey() + "=" + entry.getValue());
-			}
-			params.put("context", StringUtils.join(context.toArray(), "|"));
-		} else {
-			params.put("context", options.get("context"));
-		}
+		params.put("context", Cloudinary.encodeMap(options.get("context")));
 		return params;
 	}
 
diff --git a/cloudinary-core/src/test/java/com/cloudinary/test/UploaderTest.java b/cloudinary-core/src/test/java/com/cloudinary/test/UploaderTest.java
@@ -198,14 +198,14 @@ public void testAllowedFormats() throws Exception {
     @Test
     public void testAllowedFormatsWithIllegalFormat() throws Exception {
     	//should prevent non whitelisted formats from being uploaded if allowed_formats is specified
-    	boolean error_found = false;
+    	boolean errorFound = false;
     	String[] formats = {"jpg"}; 
     	try{
     		cloudinary.uploader().upload("src/test/resources/logo.png", Cloudinary.asMap("allowed_formats", formats));
     	} catch(Exception e) {
-        	error_found=true;
+        	errorFound=true;
         }
-        assertTrue(error_found);
+        assertTrue(errorFound);
     }
     
     @Test
