Merge pull request #5370 from atlanhq/MLH-1224

MLH-1224 Ensure restoration info is captured in ENTITY_UPDATE events for MDLH

Author: nikhilbonte21

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

@@ -1,5 +1,6 @@
 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;
@@ -105,6 +106,10 @@ 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/NoRedisServiceImpl.java

@@ -7,7 +7,7 @@
 
 import javax.annotation.PostConstruct;
 
-@Component
+@Component("redisServiceImpl")
 @ConditionalOnAtlasProperty(property = "atlas.redis.service.impl", isDefault = true)
 public class NoRedisServiceImpl extends AbstractRedisService {
 

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

@@ -9,7 +9,7 @@
 
 import javax.annotation.PostConstruct;
 
-@Component
+@Component("redisServiceImpl")
 @ConditionalOnAtlasProperty(property = "atlas.redis.service.impl")
 public class RedisServiceLocalImpl extends AbstractRedisService {
 
@@ -24,17 +24,17 @@ public void init() throws AtlasException {
 
     @Override
     public String getValue(String key) {
-        return null;
+        return super.getValue(key);
     }
 
     @Override
     public String putValue(String key, String value, int timeout) {
-        return null;
+        return super.putValue(key, value, timeout);
     }
 
     @Override
     public void removeValue(String key) {
-
+        super.removeValue(key);
     }
 
     @Override

repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasEntityComparator.java

@@ -23,6 +23,7 @@
 import org.apache.atlas.model.TypeCategory;
 import org.apache.atlas.model.instance.AtlasClassification;
 import org.apache.atlas.model.instance.AtlasEntity;
+import org.apache.atlas.repository.graph.GraphHelper;
 import org.apache.atlas.repository.graphdb.AtlasVertex;
 import org.apache.atlas.repository.util.AtlasEntityUtils;
 import org.apache.atlas.service.FeatureFlagStore;
@@ -245,6 +246,15 @@ private AtlasEntityDiffResult getDiffResult(AtlasEntity updatedEntity, AtlasEnti
             }
         }
 
+        AtlasEntity.Status newStatus  = updatedEntity.getStatus();
+        if (newStatus != null && newStatus.equals(AtlasEntity.Status.ACTIVE)) {
+            String currStatus = GraphHelper.getStateAsString(storedVertex);
+            if (currStatus != null && !currStatus.equals(newStatus.name())) {
+                sectionsWithDiff++;
+                diffEntity.setStatus(AtlasEntity.Status.ACTIVE);
+            }
+        }
+
         return new AtlasEntityDiffResult(diffEntity, sectionsWithDiff > 0, sectionsWithDiff == 1 && hasDiffInCustomAttributes, sectionsWithDiff == 1 && hasDiffInBusinessAttributes);
     }
 

repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphMapper.java

@@ -358,6 +358,9 @@ public EntityMutationResponse mapAttributesAndClassifications(EntityMutationCont
 
         if (CollectionUtils.isNotEmpty(context.getEntitiesToRestore())) {
             restoreHandlerV1.restoreEntities(context.getEntitiesToRestore());
+            for (AtlasEntityHeader restoredEntity : reqContext.getRestoredEntities()) {
+                resp.addEntity(UPDATE, restoredEntity);
+            }
         }
 
         Collection<AtlasEntity> createdEntities = context.getCreatedEntities();
@@ -594,12 +597,6 @@ public EntityMutationResponse mapAttributesAndClassifications(EntityMutationCont
             resp.addEntity(updateType, entity);
         }
 
-        if (req.getRestoredEntities() != null && req.getRestoredEntities().size() > 0) {
-            for (AtlasEntityHeader entity : req.getRestoredEntities()) {
-                resp.addEntity(UPDATE, entity);
-            }
-        }
-
         RequestContext.get().endMetricRecord(metric);
 
         return resp;