Add support to use fetch format

Author: adimiz1

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

@@ -40,6 +40,7 @@ public class Configuration {
     public Map<String, Object> properties = new HashMap<String, Object>();
     public Boolean secureCdnSubdomain;
     public boolean useRootPath;
+    public boolean useFetchFormat;
     public int timeout;
     public boolean loadStrategies = true;
     public boolean clientHints = false;
@@ -68,6 +69,7 @@ private Configuration(
             int proxyPort,
             Boolean secureCdnSubdomain,
             boolean useRootPath,
+            boolean useFetchFormat,
             int timeout,
             boolean loadStrategies,
             boolean forceVersion,
@@ -90,6 +92,7 @@ private Configuration(
         this.proxyPort = proxyPort;
         this.secureCdnSubdomain = secureCdnSubdomain;
         this.useRootPath = useRootPath;
+        this.useFetchFormat = useFetchFormat;
         this.timeout = timeout;
         this.loadStrategies = loadStrategies;
         this.forceVersion = forceVersion;
@@ -121,6 +124,7 @@ public void update(Map config) {
         this.proxyPort = ObjectUtils.asInteger(config.get("proxy_port"), 0);
         this.secureCdnSubdomain = ObjectUtils.asBoolean(config.get("secure_cdn_subdomain"), null);
         this.useRootPath = ObjectUtils.asBoolean(config.get("use_root_path"), false);
+        this.useFetchFormat = ObjectUtils.asBoolean(config.get("use_fetch_format"), false);
         this.loadStrategies = ObjectUtils.asBoolean(config.get("load_strategies"), true);
         this.timeout = ObjectUtils.asInteger(config.get("timeout"), 0);
         this.clientHints = ObjectUtils.asBoolean(config.get("client_hints"), false);
@@ -158,6 +162,7 @@ public Map<String, Object> asMap() {
         map.put("proxy_port", proxyPort);
         map.put("secure_cdn_subdomain", secureCdnSubdomain);
         map.put("use_root_path", useRootPath);
+        map.put("use_fetch_format", useFetchFormat);
         map.put("load_strategies", loadStrategies);
         map.put("timeout", timeout);
         map.put("client_hints", clientHints);
@@ -190,6 +195,7 @@ public Configuration(Configuration other) {
         this.proxyPort = other.proxyPort;
         this.secureCdnSubdomain = other.secureCdnSubdomain;
         this.useRootPath = other.useRootPath;
+        this.useFetchFormat = other.useFetchFormat;
         this.timeout = other.timeout;
         this.clientHints = other.clientHints;
         if (other.authToken != null) {
@@ -306,6 +312,7 @@ public static class Builder {
         private int proxyPort;
         private Boolean secureCdnSubdomain;
         private boolean useRootPath;
+        private boolean useFetchFormat;
         private boolean loadStrategies = true;
         private int timeout;
         private boolean clientHints = false;
@@ -347,6 +354,7 @@ public Configuration build() {
                             proxyPort,
                             secureCdnSubdomain,
                             useRootPath,
+                            useFetchFormat,
                             timeout,
                             loadStrategies,
                             forceVersion,
@@ -453,6 +461,11 @@ public Builder setUseRootPath(boolean useRootPath) {
             return this;
         }
 
+        public Builder setUseFetchFormat(boolean useFetchFormat) {
+            this.useFetchFormat = useFetchFormat;
+            return this;
+        }
+
         public Builder setLoadStrategies(boolean loadStrategies) {
             this.loadStrategies = loadStrategies;
             return this;
@@ -514,6 +527,7 @@ public Builder from(Configuration other) {
             this.proxyPort = other.proxyPort;
             this.secureCdnSubdomain = other.secureCdnSubdomain;
             this.useRootPath = other.useRootPath;
+            this.useFetchFormat = other.useFetchFormat;
             this.loadStrategies = other.loadStrategies;
             this.timeout = other.timeout;
             this.clientHints = other.clientHints;

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

@@ -35,6 +35,7 @@ public class Url {
     String source = null;
     private String urlSuffix;
     private Boolean useRootPath;
+    private Boolean useFetchFormat;
     Map<String, Transformation> sourceTransformation = null;
     String[] sourceTypes = null;
     String fallbackContent = null;
@@ -76,6 +77,7 @@ public Url clone() {
         cloned.sourceTypes = this.sourceTypes;
         cloned.urlSuffix = this.urlSuffix;
         cloned.useRootPath = this.useRootPath;
+        cloned.useFetchFormat = this.useFetchFormat;
         cloned.longUrlSignature = this.longUrlSignature;
         cloned.authToken = this.authToken;
         return cloned;
@@ -172,6 +174,11 @@ public Url useRootPath(boolean useRootPath) {
         return this;
     }
 
+    public Url useFetchFormat(boolean useFetchFormat) {
+        this.useFetchFormat = useFetchFormat;
+        return this;
+    }
+
     public Url cname(String cname) {
         this.config.cname = cname;
         return this;
@@ -366,7 +373,7 @@ public String generate(String source) {
             }
         }
 
-        if (type != null && type.equals("fetch") && !StringUtils.isEmpty(format)) {
+        if ((type != null && type.equals("fetch") || (useFetchFormat != null && useFetchFormat)) && !StringUtils.isEmpty(format)) {
             transformation().fetchFormat(format);
             this.format = null;
         }

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

@@ -492,6 +492,13 @@ public void testFetchFormat() {
         assertEquals("http://res.cloudinary.com/test123/image/fetch/f_jpg/http://cloudinary.com/images/old_logo.png", result);
     }
 
+    @Test
+    public void testUseFetchFormat() {
+        // should support use fetch format, adds the format but not an extension
+        String result = cloudinary.url().format("jpg").useFetchFormat(true).generate("old_logo");
+        assertEquals("http://res.cloudinary.com/test123/image/upload/f_jpg/old_logo", result);
+    }
+
     @Test
     public void testEffect() {
         // should support effect