fix: NPE ImmutableJsonObject/Array for null values

SAP · Feb 17, 2022 · 0a79136 · 0a79136
1 parent efe5b60
commit 0a79136
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/src/main/java/io/neonbee/internal/json/ImmutableJsonArray.java b/src/main/java/io/neonbee/internal/json/ImmutableJsonArray.java
@@ -66,12 +66,14 @@ public ImmutableJsonArray(JsonArray arr) {
 
     @Override
     public ImmutableJsonObject getJsonObject(int pos) {
-        return new ImmutableJsonObject(super.getJsonObject(pos));
+        JsonObject object = super.getJsonObject(pos);
+        return object != null ? new ImmutableJsonObject(object) : null;
     }
 
     @Override
     public ImmutableJsonArray getJsonArray(int pos) {
-        return new ImmutableJsonArray(super.getJsonArray(pos));
+        JsonArray array = super.getJsonArray(pos);
+        return array != null ? new ImmutableJsonArray(array) : null;
     }
 
     @Override

diff --git a/src/main/java/io/neonbee/internal/json/ImmutableJsonObject.java b/src/main/java/io/neonbee/internal/json/ImmutableJsonObject.java
@@ -67,22 +67,26 @@ public ImmutableJsonObject(JsonObject obj) {
 
     @Override
     public ImmutableJsonObject getJsonObject(String key) {
-        return new ImmutableJsonObject(super.getJsonObject(key));
+        JsonObject object = super.getJsonObject(key);
+        return object != null ? new ImmutableJsonObject(object) : null;
     }
 
     @Override
     public ImmutableJsonObject getJsonObject(String key, JsonObject def) {
-        return new ImmutableJsonObject(super.getJsonObject(key, def));
+        JsonObject object = super.getJsonObject(key, def);
+        return object != null ? new ImmutableJsonObject(object) : null;
     }
 
     @Override
     public ImmutableJsonArray getJsonArray(String key) {
-        return new ImmutableJsonArray(super.getJsonArray(key));
+        JsonArray array = super.getJsonArray(key);
+        return array != null ? new ImmutableJsonArray(array) : null;
     }
 
     @Override
     public ImmutableJsonArray getJsonArray(String key, JsonArray def) {
-        return new ImmutableJsonArray(super.getJsonArray(key, def));
+        JsonArray array = super.getJsonArray(key, def);
+        return array != null ? new ImmutableJsonArray(array) : null;
     }
 
     @Override

diff --git a/src/test/java/io/neonbee/internal/json/ImmutableJsonArrayTest.java b/src/test/java/io/neonbee/internal/json/ImmutableJsonArrayTest.java
@@ -92,6 +92,23 @@ void testGetComplexValues() {
         assertThrows(UnsupportedOperationException.class, () -> ((JsonArray) jsonArray.getValue(1)).add(true));
     }
 
+    @Test
+    void testGetNullComplexValues() {
+        ImmutableJsonArray jsonArray = new ImmutableJsonArray(new JsonArray().addNull());
+        assertThat(jsonArray.getJsonObject(0)).isNull();
+        assertThat(jsonArray.getJsonArray(0)).isNull();
+
+        ImmutableJsonObject jsonObject = new ImmutableJsonObject(new JsonObject().putNull("baz"));
+        assertThat(jsonObject.getJsonObject("foo")).isNull();
+        assertThat(jsonObject.getJsonObject("foo", null)).isNull();
+        assertThat(jsonObject.getJsonArray("bar")).isNull();
+        assertThat(jsonObject.getJsonArray("bar", null)).isNull();
+        assertThat(jsonObject.getJsonObject("baz")).isNull();
+        assertThat(jsonObject.getJsonObject("baz", null)).isNull();
+        assertThat(jsonObject.getJsonArray("baz")).isNull();
+        assertThat(jsonObject.getJsonArray("baz", null)).isNull();
+    }
+
     @Test
     void testMutableCopyIsMutable() {
         assertDoesNotThrow(() -> new ImmutableJsonArray().mutableCopy().add(true));