Merge pull request #5406 from atlanhq/staging-helper

Staging helper

Author: nikhilbonte21

common/src/main/java/org/apache/atlas/repository/Constants.java

@@ -536,6 +536,13 @@ public enum SupportedFileExtensions { XLSX, XLS, CSV }
         add(STAKEHOLDER_TITLE_ENTITY_TYPE);
     }};
 
+    public static final String TYPEDEF_ENUM_CACHE_LATEST_VERSION = "typdef.enum.cache.version";
+    public static final String TYPEDEF_BUSINESS_METADATA_CACHE_LATEST_VERSION = "typdef.bm.cache.version";
+    public static final String TYPEDEF_CLASSIFICATION_METADATA_CACHE_LATEST_VERSION = "typdef.cls.cache.version";
+    public static final String TYPEDEF_STRUCT_CACHE_LATEST_VERSION = "typdef.struct.cache.version";
+    public static final String TYPEDEF_ENTITY_CACHE_LATEST_VERSION = "typdef.entity.cache.version";
+    public static final String TYPEDEF_RELATIONSHIP_CACHE_LATEST_VERSION = "typdef.relationship.cache.version";
+
     private Constants() {
     }
 

common/src/main/java/org/apache/atlas/service/FeatureFlagStore.java

@@ -1,6 +1,5 @@
 package org.apache.atlas.service;
 
-import org.apache.atlas.service.redis.NoRedisServiceImpl;
 import org.apache.atlas.service.redis.RedisService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeansException;
@@ -106,10 +105,6 @@ public void initialize() throws InterruptedException {
     private void validateDependencies() {
         LOG.info("Validating FeatureFlagStore dependencies...");
         try {
-            if (redisService instanceof NoRedisServiceImpl) {
-                return;
-            }
-
             // Test Redis connectivity with a simple operation
             String testKey = "ff:_health_check";
             redisService.putValue(testKey, "test");

common/src/main/java/org/apache/atlas/service/redis/AbstractRedisService.java

@@ -5,6 +5,7 @@
 import org.apache.atlas.service.metrics.MetricUtils;
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.StringUtils;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.redisson.config.Config;
@@ -191,6 +192,22 @@ public String getValue(String key) {
         }
     }
 
+    @Override
+    public String getValue(String key, String defaultValue) {
+        try {
+            String value = getValue(key);
+            if (StringUtils.isEmpty(value)) {
+                return defaultValue;
+            } else {
+                return value;
+            }
+        } catch (Exception e) {
+            MetricUtils.recordRedisConnectionFailure();
+            getLogger().error("Redis getValue operation failed for key: {}", key, e);
+            throw e;
+        }
+    }
+
     @Override
     public String putValue(String key, String value) {
         try {

common/src/main/java/org/apache/atlas/service/redis/NoRedisServiceImpl.java

@@ -16,6 +16,8 @@ public interface RedisService {
 
   String getValue(String key);
 
+  String getValue(String key, String defaultValue);
+
   String putValue(String key, String value);
 
   String putValue(String key, String value, int timeout);

common/src/main/java/org/apache/atlas/service/redis/RedisService.java

@@ -1,7 +1,6 @@
 package org.apache.atlas.service.redis;
 
 import org.apache.atlas.AtlasException;
-import org.apache.atlas.annotation.ConditionalOnAtlasProperty;
 import org.apache.atlas.service.metrics.MetricUtils;
 import org.redisson.Redisson;
 import org.slf4j.Logger;
@@ -13,9 +12,8 @@
 import javax.annotation.PostConstruct;
 
 @Component
-@ConditionalOnAtlasProperty(property = "atlas.redis.service.impl")
 @Order(Ordered.HIGHEST_PRECEDENCE)
-public class RedisServiceImpl extends AbstractRedisService{
+public class RedisServiceImpl extends AbstractRedisService {
 
     private static final Logger LOG = LoggerFactory.getLogger(RedisServiceImpl.class);
     private static final long RETRY_DELAY_MS = 1000L;