Fix responsive breakpoint format field implementation, add tests.

Author: nitzanj

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

@@ -1,13 +1,8 @@
 package com.cloudinary;
 
-import com.cloudinary.utils.StringUtils;
-
 import org.cloudinary.json.JSONObject;
 
 public class ResponsiveBreakpoint extends JSONObject {
-    private Transformation transformation = null;
-    private String format = "";
-
     public ResponsiveBreakpoint() {
         put("create_derived", true);
     }
@@ -22,33 +17,21 @@ public ResponsiveBreakpoint createDerived(boolean createDerived) {
     }
 
     public Transformation transformation() {
-        return transformation;
+        return (Transformation) opt("transformation");
     }
 
     public ResponsiveBreakpoint transformation(Transformation transformation) {
-        this.transformation = transformation;
-        updateTransformationKey();
+        put("transformation", transformation);
         return this;
     }
 
-
     public ResponsiveBreakpoint format(String format) {
-        this.format = format;
-        updateTransformationKey();
+        put("format", format);
         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);
+        return optString("format");
     }
 
     public int maxWidth() {

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

@@ -502,16 +502,22 @@ public void testFilenameOption() throws Exception {
 
     @Test
     public void testResponsiveBreakpoints() throws Exception {
-        ResponsiveBreakpoint breakpoint = new ResponsiveBreakpoint().maxImages(2).createDerived(false).format("gif");
+        ResponsiveBreakpoint breakpoint = new ResponsiveBreakpoint()
+                .createDerived(true)
+                .maxImages(2)
+                .transformation(new Transformation().angle(90))
+                .format("gif");
 
         // A single breakpoint
         Map result = cloudinary.uploader().upload(SRC_TEST_IMAGE, asMap("responsive_breakpoints",
-                breakpoint, "tags", Arrays.asList(SDK_TEST_TAG, UPLOADER_TAG)
-        ));
+                breakpoint, "tags", Arrays.asList(SDK_TEST_TAG, UPLOADER_TAG)));
+
         java.util.ArrayList breakpointsResponse = (java.util.ArrayList) result.get("responsive_breakpoints");
-        java.util.ArrayList breakpoints = (java.util.ArrayList) ((Map) breakpointsResponse.get(0)).get("breakpoints");
-        assertEquals(2, breakpoints.size());
+        Map map = (Map) breakpointsResponse.get(0);
+
+        java.util.ArrayList breakpoints = (java.util.ArrayList) map.get("breakpoints");
         assertTrue(((Map) breakpoints.get(0)).get("url").toString().endsWith("gif"));
+        assertEquals("a_90", map.get("transformation"));
 
         // check again with transformation + format
         breakpoint.transformation(new Transformation().effect("sepia"));