Repository: atlas Updated Branches: refs/heads/master 4dc6284eb -> 0b9d7113c
ATLAS-2703: Fix in Term DTO mapping Change-Id: I23b53086b2bb2380f451e7d85b59096edc610181 Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/0b9d7113 Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/0b9d7113 Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/0b9d7113 Branch: refs/heads/master Commit: 0b9d7113cb83af04f0c093e428494771b1e895b8 Parents: 4dc6284 Author: apoorvnaik <apoorvn...@apache.org> Authored: Fri May 18 17:05:07 2018 -0700 Committer: apoorvnaik <apoorvn...@apache.org> Committed: Fri May 18 17:05:07 2018 -0700 ---------------------------------------------------------------------- .../atlas/repository/ogm/glossary/AtlasGlossaryTermDTO.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/atlas/blob/0b9d7113/repository/src/main/java/org/apache/atlas/repository/ogm/glossary/AtlasGlossaryTermDTO.java ---------------------------------------------------------------------- diff --git a/repository/src/main/java/org/apache/atlas/repository/ogm/glossary/AtlasGlossaryTermDTO.java b/repository/src/main/java/org/apache/atlas/repository/ogm/glossary/AtlasGlossaryTermDTO.java index d557752..d276f81 100644 --- a/repository/src/main/java/org/apache/atlas/repository/ogm/glossary/AtlasGlossaryTermDTO.java +++ b/repository/src/main/java/org/apache/atlas/repository/ogm/glossary/AtlasGlossaryTermDTO.java @@ -21,6 +21,7 @@ import org.apache.atlas.exception.AtlasBaseException; import org.apache.atlas.model.glossary.AtlasGlossaryTerm; import org.apache.atlas.model.instance.AtlasEntity; import org.apache.atlas.model.instance.AtlasRelatedObjectId; +import org.apache.atlas.model.instance.AtlasRelationship; import org.apache.atlas.type.AtlasTypeRegistry; import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; @@ -86,7 +87,10 @@ public class AtlasGlossaryTermDTO extends AbstractGlossaryDTO<AtlasGlossaryTerm> for (Object assignedEntity : (Collection) assignedEntities) { if (assignedEntity instanceof AtlasRelatedObjectId) { AtlasRelatedObjectId id = (AtlasRelatedObjectId) assignedEntity; - ret.addAssignedEntity(id); + // Since the edges are not a hard delete we need to filter the DELETED ones + if (id.getRelationshipStatus() == AtlasRelationship.Status.ACTIVE) { + ret.addAssignedEntity(id); + } } } }