Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions cloudinary-core/src/main/java/com/cloudinary/Api.java
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ public ApiResponse resourceByAssetID(String assetId, Map options) throws Excepti
if(options.get("fields") != null) {
options.put("fields", StringUtils.join(ObjectUtils.asArray(options.get("fields")), ","));
}
Map params = ObjectUtils.only(options, "tags", "context", "moderations", "fields");
Map params = buildResourceDetailParams(options);
ApiResponse response = callApi(HttpMethod.GET, Arrays.asList("resources", assetId), params, options);
return response;
}
Expand Down Expand Up @@ -209,15 +209,19 @@ public ApiResponse resource(String public_id, Map options) throws Exception {
if (options == null) options = ObjectUtils.emptyMap();
String resourceType = ObjectUtils.asString(options.get("resource_type"), "image");
String type = ObjectUtils.asString(options.get("type"), "upload");
Map params = buildResourceDetailParams(options);

ApiResponse response = callApi(HttpMethod.GET, Arrays.asList("resources", resourceType, type, public_id),
ObjectUtils.only(options, "exif", "colors", "faces", "coordinates",
"image_metadata", "pages", "phash", "max_results", "quality_analysis", "cinemagraph_analysis",
"accessibility_analysis", "versions", "media_metadata", "derived_next_cursor"), options);
ApiResponse response = callApi(HttpMethod.GET, Arrays.asList("resources", resourceType, type, public_id), params, options);

return response;
}

private Map buildResourceDetailParams(Map options) {
return ObjectUtils.only(options, "exif", "colors", "faces", "coordinates",
"image_metadata", "pages", "phash", "max_results", "quality_analysis", "cinemagraph_analysis",
"accessibility_analysis", "versions", "media_metadata", "derived_next_cursor");
}

public ApiResponse update(String public_id, Map options) throws Exception {
if (options == null) options = ObjectUtils.emptyMap();
String resourceType = ObjectUtils.asString(options.get("resource_type"), "image");
Expand Down