RANGER-4440: remove stale code that attempts to decompress x_security_zone.jsonData - #4
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/SecurityZoneDBStore.java b/security-admin/src/main/java/org/apache/ranger/biz/SecurityZoneDBStore.java
index 8d22fb4..a877597 100755
--- a/security-admin/src/main/java/org/apache/ranger/biz/SecurityZoneDBStore.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/SecurityZoneDBStore.java
@@ -17,7 +17,6 @@
package org.apache.ranger.biz;
-import java.io.IOException;
import java.util.*;
import javax.annotation.PostConstruct;
@@ -26,7 +25,6 @@
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang.StringUtils;
-import org.apache.ranger.authorization.utils.StringUtil;
import org.apache.ranger.common.MessageEnums;
import org.apache.ranger.common.RESTErrorUtil;
import org.apache.ranger.common.RangerSearchUtil;
@@ -53,9 +51,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
@Component
public class SecurityZoneDBStore implements SecurityZoneStore {
private static final Logger LOG = LoggerFactory.getLogger(SecurityZoneDBStore.class);
@@ -125,21 +120,7 @@
@Override
public RangerSecurityZone updateSecurityZoneById(RangerSecurityZone securityZone) throws Exception {
- XXSecurityZone xxSecurityZone = daoMgr.getXXSecurityZoneDao().findByZoneId(securityZone.getId());
- if (xxSecurityZone == null) {
- throw restErrorUtil.createRESTException("security-zone with id: " + securityZone.getId() + " does not exist");
- }
-
- Gson gsonBuilder = new GsonBuilder().setDateFormat("yyyyMMdd-HH:mm:ss.SSS-Z").create();
- String json = xxSecurityZone.getJsonData();
-
- try {
- json = StringUtil.decompressString(json);
- } catch (IOException excp) {
- LOG.error("updateSecurityZoneById(): json decompression failed. Will treat as uncompressed json", excp);
- }
-
- RangerSecurityZone oldSecurityZone = gsonBuilder.fromJson(json, RangerSecurityZone.class);
+ RangerSecurityZone oldSecurityZone = securityZoneService.read(securityZone.getId());
daoMgr.getXXGlobalState().onGlobalStateChange(RANGER_GLOBAL_STATE_NAME);
