Merge pull request #5490 from atlanhq/mesh-645-repair

MESH-645 : Repair API for daapOutputPortGuids

Author: PRATHAM2002-DS

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

@@ -2,6 +2,7 @@
 
 import org.apache.atlas.AtlasErrorCode;
 import org.apache.atlas.exception.AtlasBaseException;
+import org.apache.atlas.repository.graphdb.AtlasGraph;
 import org.apache.atlas.repository.graphdb.AtlasVertex;
 import org.apache.atlas.repository.store.graph.v2.AtlasGraphUtilsV2;
 import org.apache.atlas.repository.store.graph.v2.EntityGraphRetriever;
@@ -22,11 +23,14 @@ public class RemoveInvalidGuidsRepairStrategy implements AtlasRepairAttributeStr
 
     private final TransactionInterceptHelper transactionInterceptHelper;
 
+
     private static final String REPAIR_TYPE = "REMOVE_INVALID_OUTPUT_PORT_GUIDS";
+    private AtlasGraph graph;
 
-    public RemoveInvalidGuidsRepairStrategy(EntityGraphRetriever entityRetriever, TransactionInterceptHelper transactionInterceptHelper) {
+    public RemoveInvalidGuidsRepairStrategy(EntityGraphRetriever entityRetriever, TransactionInterceptHelper transactionInterceptHelper, AtlasGraph graph) {
         this.entityRetriever = entityRetriever;
         this.transactionInterceptHelper = transactionInterceptHelper;
+        this.graph = graph;
     }
 
     @Override
@@ -108,7 +112,7 @@ private boolean repairAttr(AtlasVertex vertex) throws AtlasBaseException {
             List<String> invalidGuids = new ArrayList<>();
 
             for (String guid : outputPortGuids) {
-                AtlasVertex portVertex = entityRetriever.getEntityVertex(guid);
+                AtlasVertex portVertex = AtlasGraphUtilsV2.findByGuid(this.graph, guid);
                 if (portVertex != null) {
                     validGuids.add(guid);
                 } else {

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

@@ -2,6 +2,7 @@
 
 import org.apache.atlas.exception.AtlasBaseException;
 import org.apache.atlas.AtlasErrorCode;
+import org.apache.atlas.repository.graphdb.AtlasGraph;
 import org.apache.atlas.repository.store.graph.v2.EntityGraphRetriever;
 import org.apache.atlas.repository.store.graph.v2.TransactionInterceptHelper;
 import org.springframework.stereotype.Component;
@@ -14,18 +15,20 @@ public class RepairAttributeFactory {
 
     private final EntityGraphRetriever entityRetriever;
     private final TransactionInterceptHelper transactionInterceptHelper;
+    private final AtlasGraph graph;
 
     @Inject
     public RepairAttributeFactory(EntityGraphRetriever entityRetriever,
-                                  TransactionInterceptHelper transactionInterceptHelper) {
+                                  TransactionInterceptHelper transactionInterceptHelper, AtlasGraph graph) {
         this.entityRetriever = entityRetriever;
         this.transactionInterceptHelper = transactionInterceptHelper;
+        this.graph = graph;
     }
 
     public AtlasRepairAttributeStrategy getStrategy(String repairType, Set<String> entityGuids) throws AtlasBaseException {
         switch (repairType) {
             case "REMOVE_INVALID_OUTPUT_PORT_GUIDS":
-                return new RemoveInvalidGuidsRepairStrategy(entityRetriever, transactionInterceptHelper);
+                return new RemoveInvalidGuidsRepairStrategy(entityRetriever, transactionInterceptHelper, graph);
             default:
                 throw new AtlasBaseException(AtlasErrorCode.BAD_REQUEST,
                         "Unsupported repair type: " + repairType + ". Supported types: [REMOVE_INVALID_OUTPUT_PORT_GUIDS]");