Add option to exclude asset version when generating cloudinary URLs. (#166)

Author: nitzanj

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

@@ -39,6 +39,7 @@ public class Url {
     Transformation posterTransformation = null;
     String posterSource = null;
     Url posterUrl = null;
+    boolean forceVersion = true;
 
     private static final String CL_BLANK = "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7";
     public static final String[] DEFAULT_VIDEO_SOURCE_TYPES = {"webm", "mp4", "ogv"};
@@ -312,6 +313,19 @@ public Url poster(Object poster) {
         }
     }
 
+    /**
+     *  Indicates whether to add '/v1/' to the URL when the public ID includes folders and a 'version' value was
+     *  not defined.
+     *  When no version is explicitly specified and the public id contains folders, a default v1 version
+     *  is added to the url. This boolean can disable that behaviour.
+     * @param forceVersion  Whether to add the version to the url.
+     * @return This same Url instance for chaining.
+     */
+    public Url forceVersion(boolean forceVersion){
+        this.forceVersion = forceVersion;
+        return this;
+    }
+
     public String generate() {
         return generate(null);
     }
@@ -357,7 +371,8 @@ public String generate(String source) {
         source = finalizedSource[0];
         String sourceToSign = finalizedSource[1];
 
-        if (sourceToSign.contains("/") && !StringUtils.hasVersionString(sourceToSign) && !httpSource && StringUtils.isEmpty(version)) {
+        if (forceVersion && sourceToSign.contains("/") && !StringUtils.hasVersionString(sourceToSign) &&
+                !httpSource && StringUtils.isEmpty(version)) {
             version = "1";
         }
 

cloudinary-core/src/test/java/com/cloudinary/test/CloudinaryTest.java

@@ -572,6 +572,29 @@ public void testFolders() {
         assertEquals(DEFAULT_UPLOAD_PATH + "v123/folder/test", result);
     }
 
+    @Test
+    public void testFoldersWithExcludeVersion(){
+        // should not add version if the user turned off forceVersion
+        String result = cloudinary.url().forceVersion(false).generate("folder/test");
+        assertEquals(DEFAULT_UPLOAD_PATH + "folder/test", result);
+
+        // should still show explicit version if passed by the user
+        result = cloudinary.url().forceVersion(false).version("1234").generate("folder/test");
+        assertEquals(DEFAULT_UPLOAD_PATH + "v1234/folder/test", result);
+
+        // should add version no value specified for forceVersion:
+        result = cloudinary.url().generate("folder/test");
+        assertEquals(DEFAULT_UPLOAD_PATH + "v1/folder/test", result);
+
+        // should add version if forceVersion is true
+        result = cloudinary.url().forceVersion(true).generate("folder/test");
+        assertEquals(DEFAULT_UPLOAD_PATH + "v1/folder/test", result);
+
+        // should not use v1 if explicit version is passed
+        result = cloudinary.url().forceVersion(true).version("1234").generate("folder/test");
+        assertEquals(DEFAULT_UPLOAD_PATH + "v1234/folder/test", result);
+    }
+
     @Test
     public void testFoldersWithVersion() {
         // should not add version if public_id contains version already