diff --git a/metadata-dao-impl/elasticsearch-dao/src/main/java/com/linkedin/metadata/dao/utils/ESUtils.java b/metadata-dao-impl/elasticsearch-dao/src/main/java/com/linkedin/metadata/dao/utils/ESUtils.java index 3cbec0e0d9..2382d59fcd 100644 --- a/metadata-dao-impl/elasticsearch-dao/src/main/java/com/linkedin/metadata/dao/utils/ESUtils.java +++ b/metadata-dao-impl/elasticsearch-dao/src/main/java/com/linkedin/metadata/dao/utils/ESUtils.java @@ -30,7 +30,7 @@ public class ESUtils { BoolQueryBuilder filters = new BoolQueryBuilder(); // TODO: Remove checking for urn after solving META-10102 Arrays.stream(Urn.isUrn(entry.getValue()) ? new String[]{entry.getValue()} : entry.getValue().split(",")) - .forEach(elem -> filters.should(QueryBuilders.matchQuery(entry.getKey(), elem))); + .forEach(elem -> filters.should(QueryBuilders.matchQuery(entry.getKey(), elem))); boolFilter.must(filters); } return boolFilter; diff --git a/metadata-restli-resource/src/main/java/com/linkedin/metadata/restli/BaseSearchableEntityResource.java b/metadata-restli-resource/src/main/java/com/linkedin/metadata/restli/BaseSearchableEntityResource.java index 5ad784ee02..a86564080b 100644 --- a/metadata-restli-resource/src/main/java/com/linkedin/metadata/restli/BaseSearchableEntityResource.java +++ b/metadata-restli-resource/src/main/java/com/linkedin/metadata/restli/BaseSearchableEntityResource.java @@ -7,7 +7,6 @@ import com.linkedin.metadata.dao.BaseSearchDAO; import com.linkedin.metadata.dao.SearchResult; import com.linkedin.metadata.dao.utils.ModelUtils; import com.linkedin.metadata.query.AutoCompleteResult; -import com.linkedin.metadata.query.Criterion; import com.linkedin.metadata.query.CriterionArray; import com.linkedin.metadata.query.Filter; import com.linkedin.metadata.query.SearchResultMetadata; @@ -57,7 +56,6 @@ public abstract class BaseSearchableEntityResource< private static final Filter EMPTY_FILTER = new Filter().setCriteria(new CriterionArray()); private static final String MATCH_ALL = "*"; - private static final String REMOVED_FIELD = "removed"; private static final String DEFAULT_SORT_CRITERION_FIELD = "urn"; public BaseSearchableEntityResource(@Nonnull Class snapshotClass, @@ -72,7 +70,7 @@ public abstract class BaseSearchableEntityResource< protected abstract BaseSearchDAO getSearchDAO(); /** - * Returns all {@link VALUE} objects from search index which by default are NOT removed. By default the list is sorted in ascending order of urn + * Returns all {@link VALUE} objects from search index. By default the list is sorted in ascending order of urn * * @param pagingContext pagination context * @param aspectNames list of aspect names that need to be returned @@ -88,12 +86,6 @@ public abstract class BaseSearchableEntityResource< @QueryParam(PARAM_SORT) @Optional @Nullable SortCriterion sortCriterion) { final Filter searchFilter = filter != null ? filter : EMPTY_FILTER; - if (searchFilter.hasCriteria() && searchFilter.getCriteria() - .stream() - .noneMatch(t -> t.getField().equals(REMOVED_FIELD))) { - searchFilter.getCriteria().add(new Criterion().setField(REMOVED_FIELD).setValue("false")); - } - final SortCriterion searchSortCriterion = sortCriterion != null ? sortCriterion : new SortCriterion().setField(DEFAULT_SORT_CRITERION_FIELD).setOrder(SortOrder.ASCENDING); return RestliUtils.toTask( diff --git a/metadata-restli-resource/src/test/java/com/linkedin/metadata/restli/BaseSearchableEntityResourceTest.java b/metadata-restli-resource/src/test/java/com/linkedin/metadata/restli/BaseSearchableEntityResourceTest.java index 0032ae37d2..f3ef689672 100644 --- a/metadata-restli-resource/src/test/java/com/linkedin/metadata/restli/BaseSearchableEntityResourceTest.java +++ b/metadata-restli-resource/src/test/java/com/linkedin/metadata/restli/BaseSearchableEntityResourceTest.java @@ -204,7 +204,6 @@ public class BaseSearchableEntityResourceTest extends BaseEngineTest { AspectKey aspectKey2 = new AspectKey<>(AspectFoo.class, urn2, BaseLocalDAO.LATEST_VERSION); Filter filter1 = new Filter().setCriteria(new CriterionArray()); - filter1.getCriteria().add(new Criterion().setField("removed").setValue("false")); SortCriterion sortCriterion1 = new SortCriterion().setField("urn").setOrder(SortOrder.ASCENDING); when(_mockSearchDAO.search("*", filter1, sortCriterion1, 1, 2)).thenReturn(