Fixed a bug involving a JSONObject's value being a single other JSONObject, rather than a list.

Author: stevenlagoy

README.md

@@ -19,7 +19,7 @@ Add this dependency to your `pom.xml`:
 <dependency>
     <groupId>com.github.stevenlagoy</groupId>
     <artifactId>json-java-objectifier</artifactId>
-    <version>1.0.4</version>
+    <version>1.0.5</version>
 </dependency>
 ```
 

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.stevenlagoy</groupId>
     <artifactId>json-java-objectifier</artifactId>
-    <version>1.0.4</version>
+    <version>1.0.5</version>
     <packaging>jar</packaging>
     <name>JSON Java Objectifier</name>
     <description>Java tools for converting JSON into typed object structures</description>

src/main/java/core/JSONObject.java

@@ -56,6 +56,7 @@ public class JSONObject implements Iterable<Object> {
      */
     private static boolean isValidJsonType(Object value) {
         return (
+            value == null ||
             value instanceof String ||
             value instanceof Number ||
             value instanceof JSONObject ||
@@ -172,13 +173,15 @@ public Boolean getAsBoolean() {
     /** Returns the value of this JSONObject as another JSONObject, or {@code null} if unable. */
     public JSONObject getAsObject() {
 
-        if (value instanceof JSONObject) return (JSONObject) value;
+        return this;
 
-        if (value instanceof List<?> && type.equals(JSONObject.class)) {
-            return this;
-        }
+        // if (value instanceof JSONObject) return (JSONObject) value;
 
-        return null;
+        // if (value instanceof List<?> && type.equals(JSONObject.class)) {
+        //     return this;
+        // }
+
+        // return null;
     }
 
     /** Returns the value of this JSONObject as a List, or throws a ClassCastException if unable. */

src/main/java/core/JSONStringifier.java

@@ -74,7 +74,7 @@ public static String stringifyObject(JSONObject object) {
 
         if (value == null)
             sb.append("null");
-        else if (type != null && type.equals(JSONObject.class)) {
+        else if (type != null && type.equals(JSONObject.class) && value instanceof List) {
             @SuppressWarnings("unchecked")
             List<JSONObject> objects = (List<JSONObject>) value;
             sb.append("{");
@@ -85,6 +85,11 @@ else if (type != null && type.equals(JSONObject.class)) {
             }
             sb.append("}");
         }
+        else if (type != null && value instanceof JSONObject json) {
+            sb.append("{");
+            sb.append(json.toString());
+            sb.append("}");
+        }
         else if (type != null)
             sb.append(stringifyValue(value, type));
         else

src/tests/java/StringifierTests.java

@@ -40,4 +40,25 @@ public void stringifyValue() {
         assertEquals("{\"key1\" : \"value1\"}{\"key2\" : \"value2\"}", result);
     }
 
+    @Test
+    public void stringifyNestedObjects() {
+        JSONObject json = new JSONObject("root", List.of(new JSONObject("inner_1", "value 1"), new JSONObject("inner_2", "value_2")));
+        String expected = "\"root\" : {\n" +
+                          "\t\"inner_1\" : \"value 1\",\n" +
+                          "\t\"inner_2\" : \"value_2\"\n" +
+                          "}";
+        String actual = json.toString();
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void stringifyNestedSingleObject() {
+        JSONObject json = new JSONObject("parent", new JSONObject("child", null));
+        String expected = "\"parent\" : {\n" +
+                          "\t\"child\" : null\n" +
+                          "}";
+        String actual = json.toString();
+        assertEquals(expected, actual);
+    }
+
 }