check if main json structure is null/non-object, pass through as-is; …

…check if "records" exist in object, if not, pass through as-is; add tests for these cases. (#49)
teragrep · Dec 20, 2024 · 8611496 · 8611496
1 parent a69368b
commit 8611496
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 3 deletions.
diff --git a/src/main/java/com/teragrep/aer_02/json/JsonRecords.java b/src/main/java/com/teragrep/aer_02/json/JsonRecords.java
@@ -78,9 +78,14 @@ public String[] records() {
             return rv;
         }
 
-        final JsonValue recordsStructure = mainStructure.getValue("/records");
+        if (mainStructure == null || !mainStructure.getValueType().equals(JsonValue.ValueType.OBJECT)) {
+            // pass event through as-is if top-level structure is not object or doesn't exist
+            return rv;
+        }
+
+        final JsonValue recordsStructure = mainStructure.asJsonObject().get("records");
 
-        if (recordsStructure.getValueType().equals(JsonValue.ValueType.ARRAY)) {
+        if (recordsStructure != null && recordsStructure.getValueType().equals(JsonValue.ValueType.ARRAY)) {
             final JsonArray recordsArray = recordsStructure.asJsonArray();
             String[] records = new String[recordsArray.size()];
 
@@ -92,7 +97,7 @@ public String[] records() {
             return records;
         }
 
-        // pass event through as-is if "records" is not an array type
+        // pass event through as-is if "records" is not an array type or doesn't exist
         return rv;
     }
 

diff --git a/src/test/java/com/teragrep/aer_02/json/JsonRecordsTest.java b/src/test/java/com/teragrep/aer_02/json/JsonRecordsTest.java
@@ -52,6 +52,33 @@
 
 public class JsonRecordsTest {
 
+    @Test
+    void testJsonArrayCase() {
+        final String records = Json.createArrayBuilder().add(0, 1).add(1, 2).build().toString();
+        JsonRecords jr = new JsonRecords(records);
+        final String[] result = jr.records();
+        Assertions.assertEquals(1, result.length);
+        Assertions.assertEquals("[1,2]", result[0]);
+    }
+
+    @Test
+    void testEmptyJsonObjectCase() {
+        final String records = Json.createObjectBuilder().build().toString();
+        JsonRecords jr = new JsonRecords(records);
+        final String[] result = jr.records();
+        Assertions.assertEquals(1, result.length);
+        Assertions.assertEquals("{}", result[0]);
+    }
+
+    @Test
+    void testOtherJsonObjectCase() {
+        final String records = Json.createObjectBuilder().add("k1", "v1").add("k2", "v2").build().toString();
+        JsonRecords jr = new JsonRecords(records);
+        final String[] result = jr.records();
+        Assertions.assertEquals(1, result.length);
+        Assertions.assertEquals("{\"k1\":\"v1\",\"k2\":\"v2\"}", result[0]);
+    }
+
     @Test
     void testRecordsAsObjectsCase() {
         final String records = Json