(ranger) branch ranger-2.8 updated: RANGER-5442: replace repeated Gson instantiation with JsonUtils methods (#799)

[madhan]

This is an automated email from the ASF dual-hosted git repository.

madhan pushed a commit to branch ranger-2.8
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/ranger-2.8 by this push:
     new 8331a8042 RANGER-5442: replace repeated Gson instantiation with 
JsonUtils methods (#799)
8331a8042 is described below

commit 8331a8042eac129cb1a0ebf41b13831be8ee2e1a
Author: Madhan Neethiraj <mad...@apache.org>
AuthorDate: Mon Jan 12 06:45:29 2026 -0800

    RANGER-5442: replace repeated Gson instantiation with JsonUtils methods 
(#799)
    
    (cherry picked from commit ad4e268f1d2ab80718d3f642a5907743b1d466f6)
---
 .../main/java/org/apache/ranger/db/XXGlobalStateDao.java    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git 
a/security-admin/src/main/java/org/apache/ranger/db/XXGlobalStateDao.java 
b/security-admin/src/main/java/org/apache/ranger/db/XXGlobalStateDao.java
index bcf153845..2c4f7dcf4 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXGlobalStateDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXGlobalStateDao.java
@@ -17,9 +17,9 @@
 
 package org.apache.ranger.db;
 
-import com.google.gson.Gson;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.ranger.authorization.utils.JsonUtils;
 import org.apache.ranger.common.DateUtil;
 import org.apache.ranger.common.db.BaseDao;
 import org.apache.ranger.entity.XXGlobalState;
@@ -94,7 +94,7 @@ public Long getAppDataVersion(String stateName) {
         try {
             XXGlobalState       globalState     = findByStateName(stateName);
             if (globalState != null) {
-                Map<String, String> appDataVersionJson = new 
Gson().fromJson(globalState.getAppData(), Map.class);
+                Map<String, String> appDataVersionJson = 
JsonUtils.jsonToMapStringString(globalState.getAppData());
                 if (MapUtils.isNotEmpty(appDataVersionJson)) {
                     ret = 
Long.valueOf(appDataVersionJson.get(APP_DATA_ENTRY_VERSION));
                 } else {
@@ -149,16 +149,17 @@ private void createGlobalStateForAppDataVersion(String 
stateName) {
         globalState.setStateName(stateName);
         Map<String,String> appDataVersion = new HashMap<>();
         appDataVersion.put(APP_DATA_ENTRY_VERSION,new 
String(Long.toString(1L)));
-        globalState.setAppData(new Gson().toJson(appDataVersion));
+        globalState.setAppData(JsonUtils.mapToJson(appDataVersion));
         create(globalState);
     }
 
     private void updateGlobalStateForAppDataVersion(XXGlobalState globalState, 
String stateName) {
-        Map<String,String> appDataVersionJson = new 
Gson().fromJson(globalState.getAppData(),Map.class);
+        Map<String,String> appDataVersionJson = 
JsonUtils.jsonToMapStringString(globalState.getAppData());
         if (MapUtils.isNotEmpty(appDataVersionJson)) {
-            Long appDataVersion = 
Long.valueOf(appDataVersionJson.get(APP_DATA_ENTRY_VERSION)) + 1L;
+            String versionStr     = 
appDataVersionJson.get(APP_DATA_ENTRY_VERSION);
+            Long   appDataVersion = StringUtils.isNotBlank(versionStr) ? 
(Long.valueOf(versionStr) + 1L) : 1L;
             appDataVersionJson.put(APP_DATA_ENTRY_VERSION, new 
String(Long.toString(appDataVersion)));
-            globalState.setAppData(new Gson().toJson(appDataVersionJson));
+            globalState.setAppData(JsonUtils.mapToJson(appDataVersionJson));
             update(globalState);
         } else {
             //if not present create Global State for state name Version.