Changed: JSONObject.create(T) behavior...

JSONObject.create(T) will return the passed in object itself if that
object is an instance of JSONObject. This was done so that JSONObjects
can be generic members of deserialized/serialized data. Discussion will
need to happen if this method should deep-copy the JSONObject instead.

Author: MTrop

docs/CHANGELOG.md

@@ -3,6 +3,14 @@ JSON (C) Black Rook Software 2019
 by Matt Tropiano et al. (see AUTHORS.txt)
 
 
+Changed in 1.1.2
+----------------
+
+- `Changed` JSONObject.create(T) will return the passed in object itself if that object is an instance of JSONObject.
+  This was done so that JSONObjects can be generic members of deserialized/serialized data. Discussion will need to happen if this
+  method should deep-copy the JSONObject instead. 
+
+
 Changed in 1.1.1
 ----------------
 

src/main/java/com/blackrook/json/JSONObject.java

@@ -167,6 +167,8 @@ public static <T> JSONObject create(T object)
 	{
 		if (object == null)
 			return NULL;
+		else if (object instanceof JSONObject) // TODO: maybe this should copy?
+			return (JSONObject)object;
 		else if (Utils.isArray(object))
 		{
 			int len = Array.getLength(object);
@@ -917,6 +919,11 @@ private static <T> T newClassInstance(String memberName, Class<T> type)
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	private static <T, K, V> T createForType(String memberName, JSONObject jsonObject, Class<T> type, Class<K> keyType, Class<V> valueType)
 	{
+		if (JSONObject.class.isAssignableFrom(type))
+		{
+			return (T)jsonObject;
+		}
+
 		Type jsonType = jsonObject.getType();
 
 		switch (jsonType)

src/test/java/com/blackrook/json/JSONTest.java

@@ -58,14 +58,14 @@ public static class Pair
 		public int y;
 		@JSONName("name")
 		public int a;
-		private int z;
+		private JSONObject z;
 
-		public int getZ()
+		public JSONObject getZ()
 		{
 			return z;
 		}
 
-		public void setZ(int z)
+		public void setZ(JSONObject z)
 		{
 			this.z = z;
 		}