Added methods to get/set arrays

- pretty print json
- get method with generics
- tests

src/main/java/org/andrejs/json/Json.java

@@ -2,9 +2,11 @@
 
 import java.lang.reflect.Field;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 
 import static java.lang.reflect.Modifier.isStatic;
+import static java.util.stream.Collectors.toList;
 
 /** JSON Object **/
 public class Json extends MapBindings {
@@ -54,6 +56,11 @@ public String toString() {
 		return JsonSerializer.toJsonString(toMap());
 	}
 
+	/** Convert to pretty JSON string with indentation **/
+	public String toStringPretty() {
+		return JsonSerializer.toPrettyString(map);
+	}
+
 	@Override
 	public boolean equals(Object it) {
 		return (it instanceof Json) && toMap().equals( ((Json)it).toMap() );
@@ -64,6 +71,11 @@ public int hashCode() {
 		return toMap().hashCode();
 	}
 
+	@SuppressWarnings("unchecked")
+	public <T> T get(String key) {
+		return (T) map.get(key);
+	}
+
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	/** Get a value or a default value **/
 	public <T> T get(String key, T defaultValue) {
@@ -83,6 +95,12 @@ public Object put(String key, Object value) {
 		return toMap().put(key, unwrap(value));
 	}
 
+	public Json putArray(String arrayField, List<?> values) {
+		List<Object> vals = values.stream().map(Json::unwrap).collect(toList());
+		put(arrayField, vals);
+		return this;
+	}
+
 	@SuppressWarnings("unchecked")
 	/** Get the map out of Json. Store nested Json objects as Maps **/
 	static <T> T unwrap(T val) {
@@ -108,6 +126,19 @@ public Json at(String ... keys) {
 		return (nested == MapOps.EMPTY_MAP) ? EMPTY : new Json(nested);
 	}
 
+	public List<Object> getArray(String key) {
+		return get(key);
+	}
+
+	public List<Json> getObjects(String key) {
+		List<Object> array = getArray(key);
+		if(array == null)
+			return null;
+		return array.stream()
+				.map(Json.of::bean)
+				.collect(toList());
+	}
+
 	/** Create a (deep) copy of this Json. **/
 	public Json copy() {
 		return new Json( MapOps.deepCopyMap(toMap()) );

src/main/java/org/andrejs/json/JsonSerializer.java

@@ -90,6 +90,8 @@ static Map<String, Object> readStream(InputStream json) {
 	@SuppressWarnings("unchecked")
 	static Map<String, Object> serialize(Object pojoBean) {
 		try {
+			if(pojoBean instanceof Map)
+				return (Map<String, Object>) pojoBean;
 			return serializer.convertValue(pojoBean, Map.class);
 		} catch (Exception e) {
 			throw new IllegalStateException(e);

src/main/java/org/andrejs/json/MapBindings.java

@@ -61,6 +61,7 @@ public boolean containsKey(Object key) {
 	}
 
 	@Override
+	@Deprecated
 	public Object get(Object key) {
 		return toMap().get(key);
 	}

src/test/java/org/andrejs/json/JsonTest.java

@@ -2,10 +2,10 @@
 
 import org.junit.Test;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Map;
 
+import static java.util.Arrays.asList;
 import static java.util.Collections.singletonMap;
 import static org.junit.Assert.*;
 
@@ -22,7 +22,8 @@ public void newJsonIsEmpty() throws Exception {
 	public void containsConstructorKeyValue() throws Exception {
 		Json json = new Json("key", 123);
 		assertTrue( json.containsKey("key") );
-		assertEquals(123, json.get("key"));
+		int val = json.get("key");
+		assertEquals(123, val);
 	}
 
 	@Test
@@ -41,7 +42,8 @@ public void containsAnonymousClassFields() throws Exception {
 			int key = 123;
 			String key2 = "val";
 		};
-		assertEquals(123, json.get("key"));
+		int val = json.get("key");
+		assertEquals(123, val);
 		assertEquals("val", json.get("key2"));
 	}
 
@@ -52,7 +54,7 @@ public void createdWithHasValues() throws Exception {
 
 	@Test
 	public void listPropertyProducesArrayInJson() throws Exception {
-		Json json = new Json("key", Arrays.asList(1, 2));
+		Json json = new Json("key", asList(1, 2));
 		assertEquals("{\"key\":[1,2]}", json.toString());
 	}
 
@@ -111,12 +113,42 @@ public void mergeProducesCombinedJson() throws Exception {
 
 	@Test
 	public void copyMakesDeepCopy() throws Exception {
-
 		Json j1 = new Json("a", new Json("b", 1));
 		Json copy = j1.copy();
 
 		assertEquals(j1, copy);
 		copy.set("c", 1);
 		assertNotSame(j1, copy);
 	}
+
+	@Test
+	public void getArray() throws Exception {
+		Json json = new Json("{key: [1, 2]}");
+		assertEquals(asList(1, 2), json.getArray("key"));
+	}
+
+	@Test
+	public void putArray() throws Exception {
+		Json json = new Json().putArray("key", asList(1, 2));
+		Json expected = new Json("{key: [1, 2]}");
+
+		assertEquals(expected, json);
+	}
+
+	@Test
+	public void getObjects() throws Exception {
+		Json o1 = new Json("a", 1), o2 = new Json("a", 2);
+		Json json = new Json("{key: [{a: 1}, {a: 2}]}");
+
+		assertEquals(asList(o1, o2), json.getObjects("key"));
+	}
+
+	@Test
+	public void putObjects() throws Exception {
+		Json o1 = new Json("a", 1), o2 = new Json("a", 2);
+		Json expected = new Json("{key: [{a: 1}, {a: 2}]}");
+		Json json = new Json().putArray("key", asList(o1, o2));
+
+		assertEquals(expected, json);
+	}
 }