Upload APIs rename call should return metadata and context

YomesInc · web-flow · commit 94092782ce64 · 2022-03-23T16:35:19.000+02:00
diff --git a/cloudinary-core/src/main/java/com/cloudinary/Uploader.java b/cloudinary-core/src/main/java/com/cloudinary/Uploader.java
@@ -247,6 +247,8 @@ public Map rename(String fromPublicId, String toPublicId, Map options) throws IO
         params.put("to_public_id", toPublicId);
         params.put("invalidate", ObjectUtils.asBoolean(options.get("invalidate"), false).toString());
         params.put("to_type", options.get("to_type"));
+        params.put("context", ObjectUtils.asBoolean(options.get("context"), false).toString());
+        params.put("metadata", ObjectUtils.asBoolean(options.get("metadata"), false).toString());
         return callApi("rename", params, options, null);
     }
 
diff --git a/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractStructuredMetadataTest.java b/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractStructuredMetadataTest.java
@@ -302,17 +302,12 @@ private SetMetadataField createSetField(String labelPrefix) {
     }
 
     private StringMetadataField newFieldInstance(String labelPrefix) throws Exception {
-        StringMetadataField field = new StringMetadataField();
         String label = labelPrefix + "_" + SUFFIX;
-        field.setLabel(label);
-        field.setMandatory(true);
-        field.setValidation(new MetadataValidation.StringLength(3, 9));
-        field.setDefaultValue("val_test");
-        return field;
+        return MetadataTestHelper.newFieldInstance(label);
     }
 
     private ApiResponse addFieldToAccount(MetadataField field) throws Exception {
-        ApiResponse apiResponse = api.addMetadataField(field);
+        ApiResponse apiResponse = MetadataTestHelper.addFieldToAccount(api, field);
         metadataFieldExternalIds.add(apiResponse.get("external_id").toString());
         return apiResponse;
     }
diff --git a/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractUploaderTest.java b/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractUploaderTest.java
@@ -219,6 +219,31 @@ public void testRename() throws Exception {
         assertEquals(cloudinary.api().resource(publicId2, ObjectUtils.emptyMap()).get("format"), "ico");
     }
 
+    @Test
+    public void testRenameShouldReturnContext() throws Exception {
+        Map result = cloudinary.uploader().upload(SRC_TEST_IMAGE, asMap("tags", Arrays.asList(SDK_TEST_TAG, UPLOADER_TAG), "context", asMap("foo", "boo")));
+
+        String publicId = result.get("public_id").toString();
+        String publicId2 = "folder/" + publicId + "2";
+        Map renameResult = cloudinary.uploader().rename(publicId, publicId2, asMap("context", true));
+        assertNotNull(renameResult.get("context"));
+    }
+
+    @Test
+    public void testRenameShouldReturnMetadata() throws Exception {
+        String label = "test" + SUFFIX;
+        StringMetadataField f = MetadataTestHelper.newFieldInstance(label);
+        Map fieldResult = MetadataTestHelper.addFieldToAccount(cloudinary.api(), f);
+        String fieldId = fieldResult.get("external_id").toString();
+        Map<String, Object> metadata = Collections.<String, Object>singletonMap(fieldId, "123456");
+        Map result = cloudinary.uploader().upload(SRC_TEST_IMAGE, asMap("tags", Arrays.asList(SDK_TEST_TAG, UPLOADER_TAG), "metadata", metadata));
+
+        String publicId = result.get("public_id").toString();
+        String publicId2 = "folder/" + publicId + "2";
+        Map renameResult = cloudinary.uploader().rename(publicId, publicId2, asMap("metadata", true));
+        assertNotNull(renameResult.get("metadata"));
+    }
+
     @Test
     public void testUniqueFilename() throws Exception {
         Map result = cloudinary.uploader().upload(SRC_TEST_IMAGE, asMap("use_filename", true, "tags", Arrays.asList(SDK_TEST_TAG, UPLOADER_TAG)));
diff --git a/cloudinary-test-common/src/main/java/com/cloudinary/test/MetadataTestHelper.java b/cloudinary-test-common/src/main/java/com/cloudinary/test/MetadataTestHelper.java
@@ -0,0 +1,24 @@
+package com.cloudinary.test;
+
+import com.cloudinary.Api;
+import com.cloudinary.api.ApiResponse;
+import com.cloudinary.metadata.MetadataField;
+import com.cloudinary.metadata.MetadataValidation;
+import com.cloudinary.metadata.StringMetadataField;
+
+public class MetadataTestHelper {
+    public static StringMetadataField newFieldInstance(String label) throws Exception {
+        StringMetadataField field = new StringMetadataField();
+        field.setLabel(label);
+        field.setMandatory(true);
+        field.setValidation(new MetadataValidation.StringLength(3, 9));
+        field.setDefaultValue("val_test");
+        return field;
+    }
+
+    public static ApiResponse addFieldToAccount(Api api, MetadataField field) throws Exception {
+        ApiResponse apiResponse = api.addMetadataField(field);
+        return apiResponse;
+    }
+}
+

Original file line number	Diff line number	Diff line change
`@@ -247,6 +247,8 @@ public Map rename(String fromPublicId, String toPublicId, Map options) throws IO`
`247`	`247`	`params.put("to_public_id", toPublicId);`
`248`	`248`	`params.put("invalidate", ObjectUtils.asBoolean(options.get("invalidate"), false).toString());`
`249`	`249`	`params.put("to_type", options.get("to_type"));`
	`250`	`+ params.put("context", ObjectUtils.asBoolean(options.get("context"), false).toString());`
	`251`	`+ params.put("metadata", ObjectUtils.asBoolean(options.get("metadata"), false).toString());`
`250`	`252`	`return callApi("rename", params, options, null);`
`251`	`253`	`}`
`252`	`254`
Original file line number	Diff line number	Diff line change
`@@ -302,17 +302,12 @@ private SetMetadataField createSetField(String labelPrefix) {`
`302`	`302`	`}`
`303`	`303`
`304`	`304`	`private StringMetadataField newFieldInstance(String labelPrefix) throws Exception {`
`305`		`- StringMetadataField field = new StringMetadataField();`
`306`	`305`	`String label = labelPrefix + "_" + SUFFIX;`
`307`		`- field.setLabel(label);`
`308`		`- field.setMandatory(true);`
`309`		`- field.setValidation(new MetadataValidation.StringLength(3, 9));`
`310`		`- field.setDefaultValue("val_test");`
`311`		`- return field;`
	`306`	`+ return MetadataTestHelper.newFieldInstance(label);`
`312`	`307`	`}`
`313`	`308`
`314`	`309`	`private ApiResponse addFieldToAccount(MetadataField field) throws Exception {`
`315`		`- ApiResponse apiResponse = api.addMetadataField(field);`
	`310`	`+ ApiResponse apiResponse = MetadataTestHelper.addFieldToAccount(api, field);`
`316`	`311`	`metadataFieldExternalIds.add(apiResponse.get("external_id").toString());`
`317`	`312`	`return apiResponse;`
`318`	`313`	`}`