Merge pull request #106 from cloudinary/fix/responsive-breakpoints-format

Add format field to `ResponsiveBreakpoint`.

Author: nitzanj

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

@@ -1,10 +1,13 @@
 package com.cloudinary;
 
-import org.cloudinary.json.JSONObject;
+import com.cloudinary.utils.StringUtils;
 
-import java.util.Collections;
+import org.cloudinary.json.JSONObject;
 
 public class ResponsiveBreakpoint extends JSONObject {
+    private Transformation transformation = null;
+    private String format = "";
+
     public ResponsiveBreakpoint() {
         put("create_derived", true);
     }
@@ -19,14 +22,35 @@ public ResponsiveBreakpoint createDerived(boolean createDerived) {
     }
 
     public Transformation transformation() {
-        return (Transformation) opt("transformation");
+        return transformation;
     }
 
     public ResponsiveBreakpoint transformation(Transformation transformation) {
-        put("transformation", Util.buildEager(Collections.singletonList(transformation)));
+        this.transformation = transformation;
+        updateTransformationKey();
+        return this;
+    }
+
+
+    public ResponsiveBreakpoint format(String format) {
+        this.format = format;
+        updateTransformationKey();
         return this;
     }
 
+    public String format() {
+        return format;
+    }
+
+    private synchronized void updateTransformationKey() {
+        String transformationStr = transformation == null ? "" : transformation.generate();
+        if (StringUtils.isNotBlank(format)){
+            transformationStr += "/" + format;
+        }
+
+        put("transformation", transformationStr);
+    }
+
     public int maxWidth() {
         return optInt("max_width");
     }
@@ -62,5 +86,4 @@ public ResponsiveBreakpoint maxImages(Integer maxImages) {
         put("max_images", maxImages);
         return this;
     }
-
 }

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

@@ -493,7 +493,7 @@ public void testFilenameOption() throws Exception {
 
     @Test
     public void testResponsiveBreakpoints() throws Exception {
-        ResponsiveBreakpoint breakpoint = new ResponsiveBreakpoint().maxImages(2).createDerived(false).transformation(new EagerTransformation().format("gif").effect("sepia"));
+        ResponsiveBreakpoint breakpoint = new ResponsiveBreakpoint().maxImages(2).createDerived(false).format("gif");
 
         // A single breakpoint
         Map result = cloudinary.uploader().upload(SRC_TEST_IMAGE, asMap("responsive_breakpoints",
@@ -504,13 +504,17 @@ public void testResponsiveBreakpoints() throws Exception {
         assertEquals(2, breakpoints.size());
         assertTrue(((Map) breakpoints.get(0)).get("url").toString().endsWith("gif"));
 
+        // check again with transformation + format
+        breakpoint.transformation(new Transformation().effect("sepia"));
+
         // an array of breakpoints
         result = cloudinary.uploader().upload(SRC_TEST_IMAGE, asMap("responsive_breakpoints",
                 new ResponsiveBreakpoint[]{breakpoint}, "tags", Arrays.asList(SDK_TEST_TAG, UPLOADER_TAG)
         ));
         breakpointsResponse = (java.util.ArrayList) result.get("responsive_breakpoints");
         breakpoints = (java.util.ArrayList) ((Map) breakpointsResponse.get(0)).get("breakpoints");
         assertEquals(2, breakpoints.size());
+        assertTrue(((Map) breakpoints.get(0)).get("url").toString().endsWith("gif"));
 
         // a JSONArray of breakpoints
         JSONArray array = new JSONArray();