Rename ResponsiveBreakpoints to ResponsiveBreakpoint and have it extend JSONObject.

Author: tocker

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

@@ -0,0 +1,64 @@
+package com.cloudinary;
+
+import org.cloudinary.json.JSONObject;
+
+public class ResponsiveBreakpoint extends JSONObject {
+    public ResponsiveBreakpoint() {
+        put("create_derived", true);
+    }
+
+    public boolean isCreateDerived() {
+        return optBoolean("create_derived");
+    }
+
+    public ResponsiveBreakpoint createDerived(boolean createDerived) {
+        put("create_derived", createDerived);
+        return this;
+    }
+
+    public Transformation transformation() {
+        return (Transformation) opt("transformation");
+    }
+
+    public ResponsiveBreakpoint transformation(Transformation transformation) {
+        put("transformation", transformation);
+        return this;
+    }
+
+    public int maxWidth() {
+        return optInt("max_width");
+    }
+
+    public ResponsiveBreakpoint maxWidth(int maxWidth) {
+        put("max_width", maxWidth);
+        return this;
+    }
+
+    public int minWidth() {
+        return optInt("min_width");
+    }
+
+    public ResponsiveBreakpoint minWidth(Integer minWidth) {
+        put("min_width", minWidth);
+        return this;
+    }
+
+    public int bytesStep() {
+        return optInt("bytes_step");
+    }
+
+    public ResponsiveBreakpoint bytesStep(Integer bytesStep) {
+        put("bytes_step", bytesStep);
+        return this;
+    }
+
+    public int maxImages() {
+        return optInt("max_images");
+    }
+
+    public ResponsiveBreakpoint maxImages(Integer maxImages) {
+        put("max_images", maxImages);
+        return this;
+    }
+
+}

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

@@ -192,7 +192,7 @@ public Map explicit(String publicId, Map options) throws IOException {
 			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("responsive_breakpoints", JSONObject.wrap(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/Uploader.java

@@ -6,10 +6,9 @@
 import java.util.List;
 import java.util.Map;
 
-import org.cloudinary.json.JSONArray;
-
 import com.cloudinary.utils.ObjectUtils;
 import com.cloudinary.utils.StringUtils;
+import org.cloudinary.json.JSONObject;
 
 public class Util {
 	static final String[] BOOLEAN_UPLOAD_OPTIONS = new String[] { "backup", "exif", "faces", "colors", "image_metadata", "use_filename", "unique_filename",
@@ -37,7 +36,9 @@ 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")));
+		Object responsive_breakpoints = options.get("responsive_breakpoints");
+		if (responsive_breakpoints != null){
+			params.put("responsive_breakpoints", JSONObject.wrap(responsive_breakpoints));}
 		params.put("upload_preset", options.get("upload_preset"));
 
 		if (options.get("signature") == null) {

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

@@ -1,29 +1,29 @@
 package com.cloudinary.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URLDecoder;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import com.cloudinary.ResponsiveBreakpoint;
+import org.cloudinary.json.JSONArray;
+import org.cloudinary.json.JSONObject;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 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;
 
+import static org.junit.Assert.*;
+
 public class CloudinaryTest {
 	private static final String DEFAULT_ROOT_PATH = "http://res.cloudinary.com/test123/";
 	private static final String DEFAULT_UPLOAD_PATH = DEFAULT_ROOT_PATH + "image/upload/";
@@ -269,7 +269,7 @@ public void testOverlay() {
 		assertNull(transformation.getHtmlWidth());
 		assertEquals(DEFAULT_UPLOAD_PATH + "h_100,l_text:hello,w_100/test", result);
 
-		transformation = new Transformation().overlay(new TextLayerBuilder().text("goodbye"));
+		transformation = new Transformation().overlay(new TextLayer().text("goodbye"));
 		result = cloudinary.url().transformation(transformation).generate("test");
 		assertEquals(DEFAULT_UPLOAD_PATH + "l_text:goodbye/test", result);
 	}
@@ -906,23 +906,23 @@ public void testAspectRatio() {
 	@Test
 	public void testOverlayOptions() {
 		Object tests[] = {
-				new LayerBuilder().publicId("logo"),
+				new Layer().publicId("logo"),
 				"logo",
-				new LayerBuilder().publicId("folder/logo"),
+				new Layer().publicId("folder/logo"),
 				"folder:logo",
-				new LayerBuilder().publicId("logo").type("private"),
+				new Layer().publicId("logo").type("private"),
 				"private:logo",
-				new LayerBuilder().publicId("logo").format("png"),
+				new Layer().publicId("logo").format("png"),
 				"logo.png",
-				new LayerBuilder().resourceType("video").publicId("cat"),
+				new Layer().resourceType("video").publicId("cat"),
 				"video:cat",
-				new TextLayerBuilder().text("Hello World, Nice to meet you?").fontFamily("Arial").fontSize(18),
+				new TextLayer().text("Hello World, Nice to meet you?").fontFamily("Arial").fontSize(18),
 				"text:Arial_18:Hello%20World%E2%80%9A%20Nice%20to%20meet%20you%3F",
-				new TextLayerBuilder().text("Hello World, Nice to meet you?").fontFamily("Arial").fontSize(18)
+				new TextLayer().text("Hello World, Nice to meet you?").fontFamily("Arial").fontSize(18)
 						.fontWeight("bold").fontStyle("italic").letterSpacing("4").lineSpacing(3),
 				"text:Arial_18_bold_italic_letter_spacing_4_line_spacing_3:Hello%20World%E2%80%9A%20Nice%20to%20meet%20you%3F",
-				new SubtitlesLayerBuilder().publicId("sample_sub_en.srt"), "subtitles:sample_sub_en.srt",
-				new SubtitlesLayerBuilder().publicId("sample_sub_he.srt").fontFamily("Arial").fontSize(40),
+				new SubtitlesLayer().publicId("sample_sub_en.srt"), "subtitles:sample_sub_en.srt",
+				new SubtitlesLayer().publicId("sample_sub_he.srt").fontFamily("Arial").fontSize(40),
 				"subtitles:Arial_40:sample_sub_he.srt" };
 
 		for (int i = 0; i < tests.length; i += 2) {
@@ -935,44 +935,40 @@ public void testOverlayOptions() {
 	@Test(expected = IllegalArgumentException.class)
 	public void testOverlayError1() {
 		// Must supply font_family for text in overlay
-		cloudinary.url().transformation(new Transformation().overlay(new TextLayerBuilder().fontStyle("italic"))).generate("test");
+		cloudinary.url().transformation(new Transformation().overlay(new TextLayer().fontStyle("italic"))).generate("test");
 	}
 
 	@Test(expected = IllegalArgumentException.class)
 	public void testOverlayError2() {
 		// Must supply public_id for for non-text underlay
-		cloudinary.url().transformation(new Transformation().underlay(new LayerBuilder().resourceType("video"))).generate("test");
+		cloudinary.url().transformation(new Transformation().underlay(new Layer().resourceType("video"))).generate("test");
 	}
 
 	@Test
 	public void testResponsiveBreakpointsToJson() {
-		assertEquals(
+		assertEquals("an empty ResponsiveBreakpoint should have create_derived=true",
 				"[{\"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()
-					}
-				));
+				new ResponsiveBreakpoint().toString()
+				);
+		JSONObject expected = new JSONObject("{\"create_derived\":false,\"max_width\":500,\"min_width\":100,\"max_images\":5,\"transformation\":\"a_45\"}");
+		JSONObject actual = new ResponsiveBreakpoint().createDerived(false)
+						.transformation(new Transformation().angle(45))
+						.maxWidth(500)
+						.minWidth(100)
+						.maxImages(5)
+		;
+		assertTrue(actual.similar(expected));
+
+		JSONArray actualArray = new JSONArray(Arrays.asList(
+				new ResponsiveBreakpoint().createDerived(false)
+						.transformation(new Transformation().angle(45))
+						.maxWidth(500)
+						.minWidth(100)
+						.maxImages(5),
+				new ResponsiveBreakpoint()
+		));;
+		JSONArray expectedArray = new JSONArray("[{\"create_derived\":false,\"max_width\":500,\"min_width\":100,\"max_images\":5,\"transformation\":\"a_45\"},{\"create_derived\":true}]");
+		assertTrue(actualArray.similar(expectedArray));
 	}
 
 	public static Map<String, String> getUrlParameters(URI uri) throws UnsupportedEncodingException {