Skip to content

Commit 725b875

Browse files
daniel cohenAmir Tocker
authored andcommitted
added comments
removed access mode level validation
1 parent 0a2192c commit 725b875

File tree

1 file changed

+12
-9
lines changed
  • cloudinary-core/src/main/java/com/cloudinary

1 file changed

+12
-9
lines changed

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

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ public ApiResponse resources(Map options) throws Exception {
7272
uri.add(type);
7373

7474
ApiResponse response = callApi(HttpMethod.GET, uri, ObjectUtils.only(options, "next_cursor", "direction", "max_results", "prefix", "tags", "context", "moderations", "start_at"), options);
75+
// stubbing default access mode to response , will be removed in final version
7576
addAccessModeToResponse(response,"public");
7677
return response;
7778
}
@@ -81,6 +82,7 @@ public ApiResponse resourcesByTag(String tag, Map options) throws Exception {
8182
String resourceType = ObjectUtils.asString(options.get("resource_type"), "image");
8283

8384
ApiResponse response = callApi(HttpMethod.GET, Arrays.asList("resources", resourceType, "tags", tag), ObjectUtils.only(options, "next_cursor", "direction", "max_results", "tags", "context", "moderations"), options);
85+
// stubbing default access mode to response , will be removed in final version
8486
addAccessModeToResponse(response,"public");
8587
return response;
8688
}
@@ -107,6 +109,7 @@ public ApiResponse resourcesByIds(Iterable<String> publicIds, Map options) throw
107109
Map params = ObjectUtils.only(options, "tags", "context", "moderations");
108110
params.put("public_ids", publicIds);
109111
ApiResponse response = callApi(HttpMethod.GET, Arrays.asList("resources", resourceType, type), params, options);
112+
// stubbing default access mode to response , will be removed in final version
110113
addAccessModeToResponse(response,"public");
111114
return response;
112115
}
@@ -116,6 +119,7 @@ public ApiResponse resourcesByModeration(String kind, String status, Map options
116119
String resourceType = ObjectUtils.asString(options.get("resource_type"), "image");
117120

118121
ApiResponse response = callApi(HttpMethod.GET, Arrays.asList("resources", resourceType, "moderations", kind, status), ObjectUtils.only(options, "next_cursor", "direction", "max_results", "tags", "context", "moderations"), options);
122+
// stubbing default access mode to response , will be removed in final version
119123
addAccessModeToResponse(response,"public");
120124
return response;
121125
}
@@ -130,6 +134,7 @@ public ApiResponse resource(String public_id, Map options) throws Exception {
130134
"image_metadata", "pages", "phash", "max_results"), options);
131135

132136

137+
// stubbing default access mode to response , will be removed in final version
133138
addAccessModeToResponse(response,"public");
134139
return response;
135140
}
@@ -143,6 +148,7 @@ public ApiResponse update(String public_id, Map options) throws Exception {
143148
params.put("moderation_status", options.get("moderation_status"));
144149
ApiResponse response = callApi(HttpMethod.POST, Arrays.asList("resources", resourceType, type, public_id),
145150
params, options);
151+
// stubbing default access mode to response , will be removed in final version
146152
addAccessModeToResponse(response,"public");
147153
return response;
148154
}
@@ -469,12 +475,14 @@ public ApiResponse updateStreamingProfile(String name, String displayName, List<
469475
return callApi(HttpMethod.PUT, uri, params, options);
470476
}
471477

478+
/* Update access mode method stubs */
472479
public ApiResponse updateResourcesAccessModeByIds(String accessMode, List<String> ids, Map options) throws Exception {
473480
if (options == null) options = ObjectUtils.asMap();
474-
validateAccessMode(accessMode);
475481
options.put("max_results",100);
476482

477483
ApiResponse response = this.resourcesByIds(ids,options);
484+
485+
// stubbing default access mode to response , will be removed in final version
478486
addAccessModeToResponse(response,accessMode);
479487
response.put("updated",response.get("resources"));
480488
response.remove("resources");
@@ -485,7 +493,6 @@ public ApiResponse updateResourcesAccessModeByIds(String accessMode, List<String
485493

486494
public ApiResponse updateResourcesAccessModeByTag(String accessMode, String tag,Map options) throws Exception {
487495
if (options == null) options = ObjectUtils.asMap();
488-
validateAccessMode(accessMode);
489496
options.put("max_results",100);
490497
ApiResponse response = this.resourcesByTag(tag,options);
491498
addAccessModeToResponse(response,accessMode);
@@ -497,7 +504,6 @@ public ApiResponse updateResourcesAccessModeByTag(String accessMode, String tag,
497504

498505
public ApiResponse updateResourcesAccessModeByPrefix(String accessMode, String prefix, Map options) throws Exception{
499506
if (options == null) options = ObjectUtils.asMap();
500-
validateAccessMode(accessMode);
501507
options.put("prefix",prefix);
502508
options.put("max_results",100);
503509
ApiResponse response = this.resources(options);
@@ -507,13 +513,9 @@ public ApiResponse updateResourcesAccessModeByPrefix(String accessMode, String p
507513
response.put("failed" ,Arrays.asList());
508514
return response;
509515
}
516+
/* Update access mode method stubs */
510517

511-
private void validateAccessMode(String accessMode){
512-
List<String> modes = Arrays.asList("public","authenticated");
513-
if (!modes.contains(accessMode)){
514-
throw new Error("access mode \""+accessMode+"\" not does not match "+ StringUtils.join(modes,"/"));
515-
}
516-
}
518+
/* Temporary access mode helper methods */
517519

518520
private void addAccessModeToCollection(Object collection, String accessMode){
519521
List<Object> collectionList = (List) collection;
@@ -541,6 +543,7 @@ private void addAccessModeToResource(Object resource, String accessMode){
541543
if (resourceMap==null) { return ;}
542544
resourceMap.put("access_mode",accessMode);
543545
}
546+
/* temporary access_mode stubs */
544547

545548
/**
546549
* @see Api#updateStreamingProfile(String, String, List, Map)

0 commit comments

Comments
 (0)