support responsive breakpoints paramater

Author: itaibenari

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

@@ -0,0 +1,95 @@
+package com.cloudinary;
+
+import org.cloudinary.json.JSONArray;
+import org.cloudinary.json.JSONObject;
+
+public class ResponsiveBreakpoints {
+	private boolean createDerived = true;
+	private Transformation transformation = null;
+	private Integer maxWidth = null;  //default 1000
+	private Integer minWidth = null;  //default 50
+	private Integer bytesStep = null; //default 20kb
+	private Integer maxImages = null; //default 20
+	
+	public boolean isCreateDerived() {
+		return createDerived;
+	}
+	public ResponsiveBreakpoints createDerived(boolean createDerived) {
+		this.createDerived = createDerived;
+		return this;
+	}
+	
+	public Transformation transformation() {
+		return transformation;
+	}
+	public ResponsiveBreakpoints transformation(Transformation transformation) {
+		this.transformation = transformation;
+		return this;
+	}
+	
+	public Integer maxWidth() {
+		return maxWidth;
+	}
+	public ResponsiveBreakpoints maxWidth(Integer maxWidth) {
+		this.maxWidth = maxWidth;
+		return this;
+	}
+	
+	public Integer minWidth() {
+		return minWidth;
+	}
+	public ResponsiveBreakpoints minWidth(Integer minWidth) {
+		this.minWidth = minWidth;
+		return this;
+	}
+	
+	public Integer bytesStep() {
+		return bytesStep;
+	}
+	public ResponsiveBreakpoints bytesStep(Integer bytesStep) {
+		this.bytesStep = bytesStep;
+		return this;
+	}
+	
+	public Integer maxImages() {
+		return maxImages;
+	}
+	public ResponsiveBreakpoints maxImages(Integer maxImages) {
+		this.maxImages = maxImages;
+		return this;
+	}
+	
+	public JSONObject toJson() {
+		JSONObject json = new JSONObject();
+		json.put("create_derived", createDerived);
+		if (transformation != null)
+			json.put("transformation", transformation.generate());
+		if (maxWidth != null)
+			json.put("max_width", maxWidth);
+		if (minWidth != null)
+			json.put("min_width", minWidth);
+		if (bytesStep != null)
+			json.put("bytes_step", bytesStep);
+		if (maxImages != null)
+			json.put("max_images", maxImages);
+		return json;
+	}
+	
+	public static String toJsonString(Object breakpoints) {
+		if (breakpoints == null)
+			return null;
+		
+		JSONArray arr = new JSONArray();
+		if (breakpoints instanceof ResponsiveBreakpoints) {
+			arr.put(0, ((ResponsiveBreakpoints) breakpoints).toJson());
+		} else if (breakpoints instanceof ResponsiveBreakpoints[]) {
+			for (ResponsiveBreakpoints i : (ResponsiveBreakpoints[]) breakpoints) {
+				arr.put(i.toJson());
+			}
+		} else {
+			throw new IllegalArgumentException("breakpoints must be either of type ResponsiveBreakpoints or ResponsiveBreakpoints[]");
+		}
+		return arr.toString();
+	}
+	
+}

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

@@ -191,6 +191,9 @@ public Map explicit(String publicId, Map options) throws IOException {
 		if (options.get("context") != null) {
 			params.put("context", ObjectUtils.encodeMap(options.get("context")));
 		}
+		if (options.get("responsive_breakpoints") != null) {
+			params.put("responsive_breakpoints", ResponsiveBreakpoints.toJsonString(options.get("responsive_breakpoints")));
+		}
 		params.put("invalidate", ObjectUtils.asBoolean(options.get("invalidate"), false).toString());
 		return callApi("explicit", params, options, null);
 	}

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

@@ -6,6 +6,8 @@
 import java.util.List;
 import java.util.Map;
 
+import org.cloudinary.json.JSONArray;
+
 import com.cloudinary.utils.ObjectUtils;
 import com.cloudinary.utils.StringUtils;
 
@@ -35,6 +37,7 @@ public static final Map<String, Object> buildUploadParams(Map options) {
 		params.put("folder", (String) options.get("folder"));
 		params.put("allowed_formats", StringUtils.join(ObjectUtils.asArray(options.get("allowed_formats")), ","));
 		params.put("moderation", options.get("moderation"));
+		params.put("responsive_breakpoints", ResponsiveBreakpoints.toJsonString(options.get("responsive_breakpoints")));
 		params.put("upload_preset", options.get("upload_preset"));
 
 		if (options.get("signature") == null) {

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

@@ -19,6 +19,7 @@
 import org.junit.rules.TestName;
 
 import com.cloudinary.Cloudinary;
+import com.cloudinary.ResponsiveBreakpoints;
 import com.cloudinary.Transformation;
 import com.cloudinary.transformation.*;
 import com.cloudinary.utils.ObjectUtils;
@@ -942,6 +943,37 @@ public void testOverlayError2() {
 		// Must supply public_id for for non-text underlay
 		cloudinary.url().transformation(new Transformation().underlay(new LayerBuilder().resourceType("video"))).generate("test");
 	}
+	
+	@Test
+	public void testResponsiveBreakpointsToJson() {
+		assertEquals(
+				"[{\"create_derived\":true}]",
+				ResponsiveBreakpoints.toJsonString(
+						new ResponsiveBreakpoints()
+				));
+		
+		assertEquals(
+				"[{\"create_derived\":false,\"max_width\":500,\"min_width\":100,\"max_images\":5,\"transformation\":\"a_45\"}]",
+				ResponsiveBreakpoints.toJsonString(
+						new ResponsiveBreakpoints().createDerived(false)
+												   .transformation(new Transformation().angle(45))
+												   .maxWidth(500)
+												   .minWidth(100)
+												   .maxImages(5)
+				));
+		assertEquals(
+				"[{\"create_derived\":false,\"max_width\":500,\"min_width\":100,\"max_images\":5,\"transformation\":\"a_45\"},{\"create_derived\":true}]",
+				ResponsiveBreakpoints.toJsonString(
+					new ResponsiveBreakpoints[]{
+						new ResponsiveBreakpoints().createDerived(false)
+												   .transformation(new Transformation().angle(45))
+												   .maxWidth(500)
+												   .minWidth(100)
+												   .maxImages(5),
+					    new ResponsiveBreakpoints()
+					}
+				));
+	}
 
 	public static Map<String, String> getUrlParameters(URI uri) throws UnsupportedEncodingException {
 		Map<String, String> params = new HashMap<String, String>();

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

@@ -25,6 +25,7 @@
 
 import com.cloudinary.Cloudinary;
 import com.cloudinary.Coordinates;
+import com.cloudinary.ResponsiveBreakpoints;
 import com.cloudinary.Transformation;
 import com.cloudinary.utils.ObjectUtils;
 import com.cloudinary.utils.Rectangle;
@@ -419,5 +420,15 @@ public void testFilenameOption() throws Exception {
     	Map result = cloudinary.uploader().upload(SRC_TEST_IMAGE, ObjectUtils.asMap("filename", "emanelif"));
     	assertEquals("emanelif", result.get("original_filename"));
     }
+    
+    @Test
+    public void testResponsiveBreakpoints() throws Exception {
+    	Map result = cloudinary.uploader().upload(SRC_TEST_IMAGE, ObjectUtils.asMap("responsive_breakpoints", 
+    			new ResponsiveBreakpoints().maxImages(2).createDerived(false)
+    		));
+    	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());
+    }
 
 }