From 835ecf010b1b908a3b39e24b5642c0f5087d0149 Mon Sep 17 00:00:00 2001 From: PRATHAM2002-DS Date: Tue, 9 Jul 2024 23:37:31 +0530 Subject: [PATCH] resolved conflicts --- .../graph/v2/preprocessor/datamesh/DataDomainPreProcessor.java | 3 ++- .../v2/preprocessor/datamesh/StakeholderTitlePreProcessor.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/preprocessor/datamesh/DataDomainPreProcessor.java b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/preprocessor/datamesh/DataDomainPreProcessor.java index 289de1ddfb..03e7f17202 100644 --- a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/preprocessor/datamesh/DataDomainPreProcessor.java +++ b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/preprocessor/datamesh/DataDomainPreProcessor.java @@ -18,6 +18,7 @@ package org.apache.atlas.repository.store.graph.v2.preprocessor.datamesh; +import com.sun.org.apache.bcel.internal.generic.NEW; import org.apache.atlas.AtlasErrorCode; import org.apache.atlas.RequestContext; import org.apache.atlas.authorize.AtlasAuthorizationUtils; @@ -405,7 +406,7 @@ public List getStakeholderTitle(String domainQualifiedName) t mustClauseList.add(mapOf("term", mapOf("__typeName.keyword", STAKEHOLDER_TITLE_ENTITY_TYPE))); List termsList = Arrays.asList( - SUPER_WILDCARD, + NEW_STAR, STAR, domainQualifiedName ); diff --git a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/preprocessor/datamesh/StakeholderTitlePreProcessor.java b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/preprocessor/datamesh/StakeholderTitlePreProcessor.java index 799f36cb95..b262e65ae7 100644 --- a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/preprocessor/datamesh/StakeholderTitlePreProcessor.java +++ b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/preprocessor/datamesh/StakeholderTitlePreProcessor.java @@ -48,7 +48,7 @@ public class StakeholderTitlePreProcessor implements PreProcessor { public static final String STAR = "*/super"; - public static final String SUPER_WILDCARD = "default/domain/*/super"; + public static final String NEW_STAR = "default/domain/*/super"; public static final String ATTR_DOMAIN_QUALIFIED_NAMES = "stakeholderTitleDomainQualifiedNames"; public static final String REL_ATTR_STAKEHOLDERS = "stakeholders";