From f5327eb2e289407671c8ffadc3e7c751e251c548 Mon Sep 17 00:00:00 2001 From: Sriharsha Chintalapani Date: Fri, 1 Dec 2023 20:54:17 -0800 Subject: [PATCH] Minor: Fix showing soft deleted entities (#14205) --- .../java/org/openmetadata/service/jdbi3/ChartRepository.java | 2 +- .../org/openmetadata/service/jdbi3/ContainerRepository.java | 2 +- .../org/openmetadata/service/jdbi3/DashboardRepository.java | 2 +- .../openmetadata/service/jdbi3/GlossaryTermRepository.java | 4 ++-- .../org/openmetadata/service/jdbi3/MlModelRepository.java | 2 +- .../org/openmetadata/service/jdbi3/PipelineRepository.java | 2 +- .../org/openmetadata/service/jdbi3/SearchIndexRepository.java | 2 +- .../openmetadata/service/jdbi3/StoredProcedureRepository.java | 2 +- .../java/org/openmetadata/service/jdbi3/TopicRepository.java | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ChartRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ChartRepository.java index 1ccae2abe39..7a2018407fd 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ChartRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ChartRepository.java @@ -86,7 +86,7 @@ public class ChartRepository extends EntityRepository { @Override public EntityInterface getParentEntity(Chart entity, String fields) { - return Entity.getEntity(entity.getService(), fields, Include.NON_DELETED); + return Entity.getEntity(entity.getService(), fields, Include.ALL); } public class ChartUpdater extends ColumnEntityUpdater { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ContainerRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ContainerRepository.java index 7ced08dbe10..61a04c06817 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ContainerRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ContainerRepository.java @@ -180,7 +180,7 @@ public class ContainerRepository extends EntityRepository { @Override public EntityInterface getParentEntity(Container entity, String fields) { - return Entity.getEntity(entity.getService(), fields, Include.NON_DELETED); + return Entity.getEntity(entity.getService(), fields, Include.ALL); } @Override diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DashboardRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DashboardRepository.java index 9acf71656de..703f455ba5c 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DashboardRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DashboardRepository.java @@ -181,7 +181,7 @@ public class DashboardRepository extends EntityRepository { @Override public EntityInterface getParentEntity(Dashboard entity, String fields) { - return Entity.getEntity(entity.getService(), fields, Include.NON_DELETED); + return Entity.getEntity(entity.getService(), fields, Include.ALL); } private List getRelatedEntities(Dashboard dashboard, String entityType) { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/GlossaryTermRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/GlossaryTermRepository.java index 3d3c4eed9b7..3fe071ec740 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/GlossaryTermRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/GlossaryTermRepository.java @@ -284,8 +284,8 @@ public class GlossaryTermRepository extends EntityRepository { @Override public EntityInterface getParentEntity(GlossaryTerm entity, String fields) { return entity.getParent() != null - ? Entity.getEntity(entity.getParent(), fields, Include.NON_DELETED) - : Entity.getEntity(entity.getGlossary(), fields, Include.NON_DELETED); + ? Entity.getEntity(entity.getParent(), fields, Include.ALL) + : Entity.getEntity(entity.getGlossary(), fields, Include.ALL); } private void addGlossaryRelationship(GlossaryTerm term) { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/MlModelRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/MlModelRepository.java index 5cebb786d1e..ef341601ac7 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/MlModelRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/MlModelRepository.java @@ -223,7 +223,7 @@ public class MlModelRepository extends EntityRepository { @Override public EntityInterface getParentEntity(MlModel entity, String fields) { - return Entity.getEntity(entity.getService(), fields, Include.NON_DELETED); + return Entity.getEntity(entity.getService(), fields, Include.ALL); } @Override diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/PipelineRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/PipelineRepository.java index 3852a85daf0..a5c1ec2adea 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/PipelineRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/PipelineRepository.java @@ -248,7 +248,7 @@ public class PipelineRepository extends EntityRepository { @Override public EntityInterface getParentEntity(Pipeline entity, String fields) { - return Entity.getEntity(entity.getService(), fields, Include.NON_DELETED); + return Entity.getEntity(entity.getService(), fields, Include.ALL); } @Override diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/SearchIndexRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/SearchIndexRepository.java index 3b01d8ab969..d80c5527132 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/SearchIndexRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/SearchIndexRepository.java @@ -247,7 +247,7 @@ public class SearchIndexRepository extends EntityRepository { @Override public EntityInterface getParentEntity(SearchIndex entity, String fields) { - return Entity.getEntity(entity.getService(), fields, Include.NON_DELETED); + return Entity.getEntity(entity.getService(), fields, Include.ALL); } @Override diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/StoredProcedureRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/StoredProcedureRepository.java index 697cb9033cd..63f9c755a0d 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/StoredProcedureRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/StoredProcedureRepository.java @@ -100,7 +100,7 @@ public class StoredProcedureRepository extends EntityRepository @Override public EntityInterface getParentEntity(StoredProcedure entity, String fields) { - return Entity.getEntity(entity.getDatabaseSchema(), fields, Include.NON_DELETED); + return Entity.getEntity(entity.getDatabaseSchema(), fields, Include.ALL); } public void setService(StoredProcedure storedProcedure, EntityReference service) { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TopicRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TopicRepository.java index 5d5628982cf..90e9b259cda 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TopicRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TopicRepository.java @@ -235,7 +235,7 @@ public class TopicRepository extends EntityRepository { @Override public EntityInterface getParentEntity(Topic entity, String fields) { - return Entity.getEntity(entity.getService(), fields, Include.NON_DELETED); + return Entity.getEntity(entity.getService(), fields, Include.ALL); } @Override