Support metadata fields reordering

Author: YomesInc

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

@@ -710,6 +710,29 @@ public ApiResponse deleteMetadataField(String fieldExternalId) throws Exception
         return callApi(HttpMethod.DELETE, uri, Collections.<String, Object>emptyMap(), Collections.emptyMap());
     }
 
+    /**
+     * Reorders metadata fields.
+     *
+     * @param orderBy Criteria for the order (one of the fields 'label', 'external_id', 'created_at')
+     * @param direction Optional (gets either asc or desc)
+     * @param options Additional options
+     * @return List of metadata fields in their new order
+     * @throws Exception
+     */
+    public ApiResponse reorderMetadataFields(String orderBy, String direction, Map options) throws Exception {
+        if (orderBy == null) {
+            throw new IllegalArgumentException("Must supply orderBy");
+        }
+
+        List<String> uri = Arrays.asList("metadata_fields", "order");
+        Map<String, Object> map = ObjectUtils.asMap("order_by", orderBy);
+        if (direction != null) {
+            map.put("direction", direction);
+        }
+
+        return callApi(HttpMethod.PUT, uri, map, options);
+    }
+
     private Map<String, ?> extractParams(Map options, List<String> keys) {
         Map<String, Object> result = new HashMap<String, Object>();
         for (String key : keys) {

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

@@ -5,6 +5,8 @@
 import com.cloudinary.api.ApiResponse;
 import com.cloudinary.api.exceptions.BadRequest;
 import com.cloudinary.metadata.*;
+
+import org.hamcrest.Matchers;
 import org.junit.*;
 import org.junit.rules.TestName;
 
@@ -172,6 +174,38 @@ public void testRestoreDatasourceEntries() throws Exception {
         assertNotNull(result);
     }
 
+    @Test
+    public void testReorderMetadataFieldsByLabel() throws Exception {
+        AddStringField("some_value");
+        AddStringField("aaa");
+        AddStringField("zzz");
+        
+        ApiResponse result = api.reorderMetadataFields("label", null, Collections.EMPTY_MAP);
+        assertThat(getField(result, 0), Matchers.containsString("aaa"));
+
+        result = api.reorderMetadataFields("label", "desc", Collections.EMPTY_MAP);
+        assertThat(getField(result, 0), Matchers.containsString("zzz"));
+
+        result = api.reorderMetadataFields("label", "asc", Collections.EMPTY_MAP);
+        assertThat(getField(result, 0), Matchers.containsString("aaa"));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testReorderMetadataFieldsOrderByIsRequired() throws Exception {
+        api.reorderMetadataFields(null, null, Collections.EMPTY_MAP);
+    }
+
+    private String getField(ApiResponse result, int index) {
+        String actual = ((Map)((ArrayList)result.get("metadata_fields")).get(index)).get("label").toString();
+        return actual;
+    }
+
+    private void AddStringField(String labelPrefix) throws Exception {
+        StringMetadataField field = newFieldInstance(labelPrefix);
+        ApiResponse fieldResult = addFieldToAccount(field);
+        String fieldId = fieldResult.get("external_id").toString();
+    }
+
     @Test
     public void testUploadWithMetadata() throws Exception {
         StringMetadataField field = newFieldInstance("testUploadWithMetadata");