Keep original filename in uploadLarge before sending the InputStream

Author: nitzanj

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

@@ -8,7 +8,6 @@
 import java.io.*;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 @SuppressWarnings({"rawtypes", "unchecked"})
@@ -117,10 +116,12 @@ public Map uploadLarge(Object file, Map options, int bufferSize, long offset, St
         InputStream input;
         long length = -1;
         boolean remote = false;
+        String filename = null;
         if (file instanceof InputStream) {
             input = (InputStream) file;
         } else if (file instanceof File) {
             length = ((File) file).length();
+            filename = ((File) file).getName();
             input = new FileInputStream((File) file);
         } else if (file instanceof byte[]) {
             length = ((byte[]) file).length;
@@ -132,6 +133,7 @@ public Map uploadLarge(Object file, Map options, int bufferSize, long offset, St
             } else {
                 File f = new File(file.toString());
                 length = f.length();
+                filename = f.getName();
                 input = new FileInputStream(f);
             }
         }
@@ -140,6 +142,9 @@ public Map uploadLarge(Object file, Map options, int bufferSize, long offset, St
             if (remote) {
                 result = upload(file, options);
             } else {
+                if (!options.containsKey("filename") && StringUtils.isNotBlank(filename)) {
+                    options.put("filename", filename);
+                }
                 result = uploadLargeParts(input, options, bufferSize, length, offset, uniqueUploadId, progressCallback);
             }
             return result;

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

@@ -461,10 +461,11 @@ public void testUploadLarge() throws Exception {
 
         String[] tags = new String[]{"upload_large_tag_" + SUFFIX, SDK_TEST_TAG, UPLOADER_TAG};
 
-        Map resource = cloudinary.uploader().uploadLarge(temp, asMap("resource_type", "raw", "chunk_size", 5243000, "tags", tags));
+        Map resource = cloudinary.uploader().uploadLarge(temp, asMap("use_filename", true, "resource_type", "raw", "chunk_size", 5243000, "tags", tags));
         assertArrayEquals(tags, ((java.util.ArrayList) resource.get("tags")).toArray());
 
         assertEquals("raw", resource.get("resource_type"));
+        assertTrue(resource.get("public_id").toString().startsWith("cldupload"));
 
         resource = cloudinary.uploader().uploadLarge(new FileInputStream(temp), asMap("chunk_size", 5243000, "tags", tags));
         assertArrayEquals(tags, ((java.util.ArrayList) resource.get("tags")).toArray());