Escape \ and = in context

Author: Amir Tocker

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

@@ -188,7 +188,7 @@ public Map explicit(String publicId, Map options) throws IOException {
             params.put("custom_coordinates", Coordinates.parseCoordinates(options.get("custom_coordinates")).toString());
         }
         if (options.get("context") != null) {
-            params.put("context", ObjectUtils.encodeMap(options.get("context")));
+            params.put("context", Util.encodeContext(options.get("context")));
         }
         if (options.get("responsive_breakpoints") != null) {
             params.put("responsive_breakpoints", JSONObject.wrap(options.get("responsive_breakpoints")));

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

@@ -1,10 +1,6 @@
 package com.cloudinary;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import com.cloudinary.utils.ObjectUtils;
 import com.cloudinary.utils.StringUtils;
@@ -100,7 +96,7 @@ public static final void processWriteParameters(Map<String, Object> options, Map
         if (options.get("custom_coordinates") != null)
             params.put("custom_coordinates", Coordinates.parseCoordinates(options.get("custom_coordinates")).toString());
         if (options.get("context") != null)
-            params.put("context", ObjectUtils.encodeMap(options.get("context")));
+            params.put("context", encodeContext(options.get("context")));
         putObject("ocr", options, params);
         putObject("raw_convert", options, params);
         putObject("categorization", options, params);
@@ -111,6 +107,22 @@ public static final void processWriteParameters(Map<String, Object> options, Map
             params.put("auto_tagging", ObjectUtils.asFloat(options.get("auto_tagging")));
     }
 
+    protected static String encodeContext(Object context) {
+        if (context != null && context instanceof Map) {
+            Map<String, String> mapArg = (Map<String, String>) context;
+            HashSet out = new HashSet();
+            for (Map.Entry<String, String> entry : mapArg.entrySet()) {
+                final String value = entry.getValue().replaceAll("([=\\|])","\\\\$1");
+                out.add(entry.getKey() + "=" + value);
+            }
+            return StringUtils.join(out.toArray(), "|");
+        } else if (context == null) {
+            return null;
+        } else {
+            return context.toString();
+        }
+    }
+
     @SuppressWarnings("unchecked")
     protected static final String buildCustomHeaders(Object headers) {
         if (headers == null) {

cloudinary-core/src/test/java/com/cloudinary/UtilTest.java

@@ -0,0 +1,21 @@
+package com.cloudinary;
+
+import com.cloudinary.utils.ObjectUtils;
+import org.junit.Test;
+
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
+/**
+ * Created by amir on 17/11/2016.
+ */
+public class UtilTest {
+    @Test
+    public void encodeContext() throws Exception {
+        Map context = ObjectUtils.asMap("caption", "different = caption", "alt2", "alt|alternative");
+        String result = Util.encodeContext(context);
+        assertEquals("caption=different \\= caption|alt2=alt\\|alternative", result);
+    }
+
+}

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

@@ -338,7 +338,7 @@ public void testContext() throws Exception {
         Map result = cloudinary.uploader().upload(SRC_TEST_IMAGE, ObjectUtils.asMap("context", context, "tags", SDK_TEST_TAG));
         Map info = cloudinary.api().resource((String) result.get("public_id"), ObjectUtils.asMap("context", true));
         assertEquals(ObjectUtils.asMap("custom", context), info.get("context"));
-        Map differentContext = ObjectUtils.asMap("caption", "different caption", "alt2", "alternative alternative");
+        Map differentContext = ObjectUtils.asMap("caption", "different = caption", "alt2", "alt|alternative alternative");
         cloudinary.uploader().explicit((String) result.get("public_id"), ObjectUtils.asMap("type", "upload", "context", differentContext));
         info = cloudinary.api().resource((String) result.get("public_id"), ObjectUtils.asMap("context", true));
         assertEquals(ObjectUtils.asMap("custom", differentContext), info.get("context"));