Improve support for modifying set type metadata fields. (#194)

Author: nitzanj

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

@@ -119,12 +119,19 @@ protected static String encodeAccessControl(Object accessControl) {
     }
 
     protected static String encodeContext(Object context) {
-        if (context != null && context instanceof Map) {
-            Map<String, String> mapArg = (Map<String, String>) context;
+        if (context instanceof Map) {
+            Map<String, Object> mapArg = (Map<String, Object>) 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);
+            for (Map.Entry<String, Object> entry : mapArg.entrySet()) {
+                final String value;
+                if (entry.getValue() instanceof List) {
+                    value = encodeList(((List) entry.getValue()).toArray());
+                } else if (entry.getValue() instanceof String[]) {
+                    value = encodeList((String[]) entry.getValue());
+                } else {
+                    value = entry.getValue().toString();
+                }
+                out.add(entry.getKey() + "=" + encodeSingleContextString(value));
             }
             return StringUtils.join(out.toArray(), "|");
         } else if (context == null) {
@@ -134,6 +141,26 @@ protected static String encodeContext(Object context) {
         }
     }
 
+    private static String encodeList(Object[] list) {
+        StringBuilder builder = new StringBuilder("[");
+
+        boolean first = true;
+        for (Object s : list) {
+            if (!first) {
+                builder.append(",");
+            }
+
+            builder.append("\"").append(encodeSingleContextString(s.toString())).append("\"");
+            first = false;
+        }
+
+        return builder.append("]").toString();
+    }
+
+    private static String encodeSingleContextString(String value) {
+        return value.replaceAll("([=\\|])", "\\\\$1");
+    }
+
     @SuppressWarnings("unchecked")
     protected static final String buildCustomHeaders(Object headers) {
         if (headers == null) {
@@ -165,7 +192,7 @@ public static void clearEmpty(Map params) {
     @SuppressWarnings({"rawtypes", "unchecked"})
     public static final Map<String, Object> buildArchiveParams(Map options, String targetFormat) {
         Map<String, Object> params = new HashMap<String, Object>();
-        if (options != null && options.size() > 0){
+        if (options != null && options.size() > 0) {
             params.put("type", options.get("type"));
             params.put("mode", options.get("mode"));
             params.put("target_format", targetFormat);
@@ -198,7 +225,7 @@ private static void putEager(String name, Map from, Map<String, Object> to) {
 
     private static void putBoolean(String name, Map from, Map<String, Object> to) {
         final Object value = from.get(name);
-        if(value != null){
+        if (value != null) {
             to.put(name, ObjectUtils.asBoolean(value));
         }
     }
@@ -209,16 +236,16 @@ private static void putObject(String name, Map from, Map<String, Object> to) {
 
     private static void putObject(String name, Map from, Map<String, Object> to, Object defaultValue) {
         final Object value = from.get(name);
-        if (value != null){
+        if (value != null) {
             to.put(name, value);
-        } else if(defaultValue != null){
+        } else if (defaultValue != null) {
             to.put(name, defaultValue);
         }
     }
 
     private static void putArray(String name, Map from, Map<String, Object> to) {
         final Object value = from.get(name);
-        if (value != null){
+        if (value != null) {
             to.put(name, ObjectUtils.asArray(value));
         }
     }

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

@@ -216,6 +216,21 @@ public void testUploaderUpdateMetadata() throws Exception {
         assertEquals("sample", ((List) result.get("public_ids")).get(0).toString());
     }
 
+    @Test
+    public void testSetField() throws Exception {
+        SetMetadataField field = createSetField("test123");
+        ApiResponse fieldResult = addFieldToAccount(field);
+        String fieldId = fieldResult.get("external_id").toString();
+        Map result = cloudinary.uploader().updateMetadata(asMap(fieldId, new String[]{"id2", "id3"}), new String[]{"sample"}, null);
+        assertNotNull(result);
+        assertEquals("sample", ((List) result.get("public_ids")).get(0).toString());
+        List<String> list = new ArrayList<String>(2);
+        list.add("id1");
+        list.add("id2");
+        result = cloudinary.uploader().updateMetadata(asMap(fieldId, list), new String[]{"sample"}, null);
+        assertNotNull(result);
+        assertEquals("sample", ((List) result.get("public_ids")).get(0).toString());
+    }
     // Metadata test helpers
     private SetMetadataField createSetField(String labelPrefix) {
         SetMetadataField setField = new SetMetadataField();