From d85626e061d386100cbb201218f548c5d71881fc Mon Sep 17 00:00:00 2001 From: Prashant Pandey Date: Thu, 16 Jul 2026 14:36:52 +0530 Subject: [PATCH 1/3] Return JsonNode directly in JSONDocument --- .../java/org/hypertrace/core/documentstore/Document.java | 6 ++++++ .../org/hypertrace/core/documentstore/JSONDocument.java | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/document-store/src/main/java/org/hypertrace/core/documentstore/Document.java b/document-store/src/main/java/org/hypertrace/core/documentstore/Document.java index fe9c84b85..07eebab8e 100644 --- a/document-store/src/main/java/org/hypertrace/core/documentstore/Document.java +++ b/document-store/src/main/java/org/hypertrace/core/documentstore/Document.java @@ -1,9 +1,15 @@ package org.hypertrace.core.documentstore; +import com.fasterxml.jackson.databind.JsonNode; + public interface Document { String toJson(); + default JsonNode getJsonNode() { + return null; + } + default DocumentType getDocumentType() { return DocumentType.NESTED; } diff --git a/document-store/src/main/java/org/hypertrace/core/documentstore/JSONDocument.java b/document-store/src/main/java/org/hypertrace/core/documentstore/JSONDocument.java index 85d23d706..d604a15bf 100644 --- a/document-store/src/main/java/org/hypertrace/core/documentstore/JSONDocument.java +++ b/document-store/src/main/java/org/hypertrace/core/documentstore/JSONDocument.java @@ -45,6 +45,11 @@ public DocumentType getDocumentType() { return this.documentType; } + @Override + public JsonNode getJsonNode() { + return node; + } + @Override public String toJson() { try { From aefed76b725614a937663962bd73e5e38911e807 Mon Sep 17 00:00:00 2001 From: Prashant Pandey Date: Thu, 16 Jul 2026 14:50:15 +0530 Subject: [PATCH 2/3] Added test case --- .../core/documentstore/JSONDocumentTest.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/document-store/src/test/java/org/hypertrace/core/documentstore/JSONDocumentTest.java b/document-store/src/test/java/org/hypertrace/core/documentstore/JSONDocumentTest.java index e4ec510d7..162562d2e 100644 --- a/document-store/src/test/java/org/hypertrace/core/documentstore/JSONDocumentTest.java +++ b/document-store/src/test/java/org/hypertrace/core/documentstore/JSONDocumentTest.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import java.io.IOException; import java.util.Map; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -106,4 +107,16 @@ public void testToStringMethod() throws Exception { // toString should return the same as toJson Assertions.assertEquals(document.toJson(), document.toString()); } + + @Test + public void testGetJsonMethod() throws IOException { + Map data = Map.of("key1", "value1"); + JSONDocument document = new JSONDocument(data, DocumentType.FLAT); + + JsonNode jsonNode = document.getJsonNode(); + + Assertions.assertNotNull(jsonNode); + Assertions.assertEquals(mapper.readTree(document.toJson()), jsonNode); + Assertions.assertEquals("value1", jsonNode.get("key1").asText()); + } } From 77d882aaa38b6b35cec9a4a9fef604866c161979 Mon Sep 17 00:00:00 2001 From: Prashant Pandey Date: Thu, 16 Jul 2026 16:23:19 +0530 Subject: [PATCH 3/3] Upgrade pgjdbc from 42.7.11 to 42.7.13 to address CVE-2026-54291 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4ce2ada7b..b05b32a0d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -26,7 +26,7 @@ org-junit-jupiter-junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", org-mockito-mockito-core = { module = "org.mockito:mockito-core", version.ref = "org-mockito" } org-mockito-mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter", version.ref = "org-mockito" } org-mongodb-mongodb-driver-sync = { module = "org.mongodb:mongodb-driver-sync", version = "5.2.0" } -org-postgresql = { module = "org.postgresql:postgresql", version = "42.7.11" } +org-postgresql = { module = "org.postgresql:postgresql", version = "42.7.13" } org-projectlombok-lombok = { module = "org.projectlombok:lombok", version = "1.18.30" } org-slf4j-slf4j-api = { module = "org.slf4j:slf4j-api", version = "1.7.36" } org-testcontainers = { module = "org.testcontainers:testcontainers", version.ref = "org-testcontainers" }