Add support for date param in Api.usage() (#210)

Author: nitzanj

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

@@ -55,9 +55,24 @@ public ApiResponse ping(Map options) throws Exception {
 
     public ApiResponse usage(Map options) throws Exception {
         if (options == null) options = ObjectUtils.emptyMap();
-        return callApi(HttpMethod.GET, Arrays.asList("usage"), ObjectUtils.emptyMap(), options);
+
+        final List<String> uri = new ArrayList<String>();
+        uri.add("usage");
+
+        Object date = options.get("date");
+
+        if (date != null) {
+            if (date instanceof Date) {
+                date = ObjectUtils.toUsageApiDateFormat((Date) date);
+            }
+
+            uri.add(date.toString());
+        }
+
+        return callApi(HttpMethod.GET, uri, ObjectUtils.emptyMap(), options);
     }
 
+
     public ApiResponse resourceTypes(Map options) throws Exception {
         if (options == null) options = ObjectUtils.emptyMap();
         return callApi(HttpMethod.GET, Arrays.asList("resources"), ObjectUtils.emptyMap(), options);
@@ -543,7 +558,8 @@ public ApiResponse updateResourcesAccessModeByTag(String accessMode, String tag,
 
     /**
      * Delete a folder (must be empty).
-     * @param folder The full path of the folder to delete
+     *
+     * @param folder  The full path of the folder to delete
      * @param options additional options.
      * @return The operation result.
      * @throws Exception When the folder isn't empty or doesn't exist.
@@ -588,6 +604,7 @@ private ApiResponse updateResourcesAccessMode(String accessMode, String byKey, O
 
     /**
      * Add a new metadata field definition
+     *
      * @param field The field to add.
      * @return A map representing the newly added field.
      * @throws Exception
@@ -599,6 +616,7 @@ public ApiResponse addMetadataField(MetadataField field) throws Exception {
 
     /**
      * List all the metadata field definitions (structure, not values)
+     *
      * @return A map containing the list of field definitions maps.
      * @throws Exception
      */
@@ -608,6 +626,7 @@ public ApiResponse listMetadataFields() throws Exception {
 
     /**
      * Get a metadata field definition by id
+     *
      * @param fieldExternalId The id of the field to retrieve
      * @return The fields definitions.
      * @throws Exception
@@ -618,8 +637,9 @@ public ApiResponse metadataFieldByFieldId(String fieldExternalId) throws Excepti
 
     /**
      * Update the definitions of a single metadata field.
+     *
      * @param fieldExternalId The id of the field to update
-     * @param field The field definition
+     * @param field           The field definition
      * @return The updated fields definition.
      * @throws Exception
      */
@@ -630,9 +650,10 @@ public ApiResponse updateMetadataField(String fieldExternalId, MetadataField fie
 
     /**
      * Update the datasource entries for a given field
+     *
      * @param fieldExternalId The id of the field to update
-     * @param entries A list of datasource entries. Existing entries (according to entry id) will be updated,
-     *                new entries will be added.
+     * @param entries         A list of datasource entries. Existing entries (according to entry id) will be updated,
+     *                        new entries will be added.
      * @return The updated field definition.
      * @throws Exception
      */
@@ -643,7 +664,8 @@ public ApiResponse updateMetadataFieldDatasource(String fieldExternalId, List<Me
 
     /**
      * Delete data source entries for a given field
-     * @param fieldExternalId The id of the field to update
+     *
+     * @param fieldExternalId   The id of the field to update
      * @param entriesExternalId The ids of all the entries to delete from the data source
      * @return The remaining datasource entries.
      * @throws Exception
@@ -655,7 +677,8 @@ public ApiResponse deleteDatasourceEntries(String fieldExternalId, List<String>
 
     /**
      * Restore deleted data source entries for a given field
-     * @param fieldExternalId The id of the field to operate
+     *
+     * @param fieldExternalId   The id of the field to operate
      * @param entriesExternalId The ids of all the entries to restore from the data source
      * @return The datasource entries state after restore
      * @throws Exception
@@ -667,6 +690,7 @@ public ApiResponse restoreDatasourceEntries(String fieldExternalId, List<String>
 
     /**
      * Delete a field definition.
+     *
      * @param fieldExternalId The id of the field to delete
      * @return A map with a "message" key. "ok" value indicates a successful deletion.
      * @throws Exception

cloudinary-core/src/main/java/com/cloudinary/utils/ObjectUtils.java

@@ -215,6 +215,10 @@ public static Long asLong(Object value, Long defaultValue) {
         }
     }
 
+    public static String toUsageApiDateFormat(Date date){
+        return new SimpleDateFormat("dd-MM-yyy").format(date);
+    }
+
     public static String toISO8601DateOnly(Date date) {
         return new SimpleDateFormat("yyyy-MM-dd").format(date);
     }

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

@@ -512,8 +512,20 @@ public void test20ResourcesContext() throws Exception {
     @Test
     public void test18Usage() throws Exception {
         // should support usage API call
-        Map result = api.usage(ObjectUtils.emptyMap());
+        final Date yesterday = yesterday();
+
+        Map result = api.usage(ObjectUtils.asMap("date", yesterday));
+        assertNotNull(result.get("last_updated"));
+
+        result = api.usage(ObjectUtils.asMap("date", ObjectUtils.toUsageApiDateFormat(yesterday)));
         assertNotNull(result.get("last_updated"));
+
+        result = api.usage(ObjectUtils.emptyMap());
+        assertNotNull(result.get("last_updated"));
+    }
+
+    private Date yesterday() {
+        return new Date(new Date().getTime() - 24 * 60 * 60 * 1000);
     }
 
     @Test