From 980ad8fe87d582886c670d657769ea2b45901a8e Mon Sep 17 00:00:00 2001
From: Christopher Lambert <1204398+XN137@users.noreply.github.com>
Date: Fri, 5 Sep 2025 11:45:41 +0200
Subject: [PATCH] Remove PolarisTestMetaStoreManager.jsonNode helper

the deserialization of the property maps is already available
in the `PolarisBaseEntity` class
---
 .../PolarisTestMetaStoreManager.java          | 31 +++++--------------
 1 file changed, 8 insertions(+), 23 deletions(-)

diff --git a/polaris-core/src/testFixtures/java/org/apache/polaris/core/persistence/PolarisTestMetaStoreManager.java b/polaris-core/src/testFixtures/java/org/apache/polaris/core/persistence/PolarisTestMetaStoreManager.java
index 646aeee51d..4b490b032d 100644
--- a/polaris-core/src/testFixtures/java/org/apache/polaris/core/persistence/PolarisTestMetaStoreManager.java
+++ b/polaris-core/src/testFixtures/java/org/apache/polaris/core/persistence/PolarisTestMetaStoreManager.java
@@ -18,9 +18,6 @@
  */
 package org.apache.polaris.core.persistence;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -69,7 +66,6 @@ public class PolarisTestMetaStoreManager {
 
   // the start time
   private final long testStartTime;
-  private final ObjectMapper objectMapper = new ObjectMapper();
 
   private final boolean supportsChangeTracking;
 
@@ -1515,14 +1511,14 @@ public PolarisBaseEntity updateEntity(
     Assertions.assertThat(afterUpdateEntity.getGrantRecordsVersion()).isEqualTo(grantRecsVersion);
 
     // update should have been performed
-    Assertions.assertThat(jsonNode(updatedEntity.getProperties()))
-        .isEqualTo(jsonNode(updatedPropEntity.getProperties()));
-    Assertions.assertThat(jsonNode(afterUpdateEntity.getProperties()))
-        .isEqualTo(jsonNode(updatedPropEntity.getProperties()));
-    Assertions.assertThat(jsonNode(updatedEntity.getInternalProperties()))
-        .isEqualTo(jsonNode(updatedPropEntity.getInternalProperties()));
-    Assertions.assertThat(jsonNode(afterUpdateEntity.getInternalProperties()))
-        .isEqualTo(jsonNode(updatedPropEntity.getInternalProperties()));
+    Assertions.assertThat(updatedEntity.getPropertiesAsMap())
+        .isEqualTo(updatedPropEntity.getPropertiesAsMap());
+    Assertions.assertThat(afterUpdateEntity.getPropertiesAsMap())
+        .isEqualTo(updatedPropEntity.getPropertiesAsMap());
+    Assertions.assertThat(updatedEntity.getInternalPropertiesAsMap())
+        .isEqualTo(updatedPropEntity.getInternalPropertiesAsMap());
+    Assertions.assertThat(afterUpdateEntity.getInternalPropertiesAsMap())
+        .isEqualTo(updatedPropEntity.getInternalPropertiesAsMap());
 
     // lookup the tracking slice to verify this has been updated too
     if (supportsChangeTracking) {
@@ -1542,17 +1538,6 @@ public PolarisBaseEntity updateEntity(
     return updatedEntity;
   }
 
-  private JsonNode jsonNode(String json) {
-    if (json == null) {
-      return null;
-    }
-    try {
-      return objectMapper.readTree(json);
-    } catch (JsonProcessingException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
   /** Execute a list operation and validate the result */
   private void validateListReturn(
       List<PolarisEntityCore> path,