[atlas] branch master updated: ATLAS-3868: [Regression] removing a term-association doesn't remove classifications propagated from the term

[sarath]

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

sarath pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/atlas.git


The following commit(s) were added to refs/heads/master by this push:
     new ce95c62  ATLAS-3868: [Regression] removing a term-association doesn't 
remove classifications propagated from the term
ce95c62 is described below

commit ce95c6299986eae212f6861ab423f32aa8f7f7d0
Author: Sarath Subramanian <sar...@apache.org>
AuthorDate: Mon Jun 29 22:37:32 2020 -0700

    ATLAS-3868: [Regression] removing a term-association doesn't remove 
classifications propagated from the term
    
    Signed-off-by: Sarath Subramanian <sar...@apache.org>
---
 .../apache/atlas/repository/store/graph/v1/HardDeleteHandlerV1.java  | 2 ++
 .../apache/atlas/repository/store/graph/v1/SoftDeleteHandlerV1.java  | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git 
a/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/HardDeleteHandlerV1.java
 
b/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/HardDeleteHandlerV1.java
index 72dd632..c241e23 100644
--- 
a/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/HardDeleteHandlerV1.java
+++ 
b/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/HardDeleteHandlerV1.java
@@ -53,6 +53,8 @@ public class HardDeleteHandlerV1 extends DeleteHandlerV1 {
             LOG.debug("==> HardDeleteHandlerV1.deleteEdge({}, {})", 
GraphHelper.string(edge), force);
         }
 
+        removeTagPropagation(edge);
+
         graphHelper.removeEdge(edge);
     }
 }
diff --git 
a/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/SoftDeleteHandlerV1.java
 
b/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/SoftDeleteHandlerV1.java
index 59e7cf8..bede9c3 100644
--- 
a/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/SoftDeleteHandlerV1.java
+++ 
b/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/SoftDeleteHandlerV1.java
@@ -19,6 +19,7 @@
 package org.apache.atlas.repository.store.graph.v1;
 
 import org.apache.atlas.RequestContext;
+import org.apache.atlas.exception.AtlasBaseException;
 import org.apache.atlas.model.instance.AtlasEntity.Status;
 import org.apache.atlas.repository.graph.GraphHelper;
 import org.apache.atlas.repository.graphdb.AtlasEdge;
@@ -61,12 +62,14 @@ public class SoftDeleteHandlerV1 extends DeleteHandlerV1 {
     }
 
     @Override
-    protected void deleteEdge(AtlasEdge edge, boolean force) {
+    protected void deleteEdge(AtlasEdge edge, boolean force) throws 
AtlasBaseException {
         if (LOG.isDebugEnabled()) {
             LOG.debug("==> SoftDeleteHandlerV1.deleteEdge({}, 
{})",GraphHelper.string(edge), force);
         }
 
         if (force) {
+            removeTagPropagation(edge);
+
             graphHelper.removeEdge(edge);
         } else {
             Status state = AtlasGraphUtilsV2.getState(edge);