Commit 8c136a86 by Ashutosh Mestry

ATLAS-3379: Relationship API inadvertently uses getQualifiedName.

parent d1109efe
...@@ -77,6 +77,7 @@ import static org.apache.atlas.util.AtlasGremlinQueryProvider.AtlasGremlinQuery. ...@@ -77,6 +77,7 @@ import static org.apache.atlas.util.AtlasGremlinQueryProvider.AtlasGremlinQuery.
public class EntityDiscoveryService implements AtlasDiscoveryService { public class EntityDiscoveryService implements AtlasDiscoveryService {
private static final Logger LOG = LoggerFactory.getLogger(EntityDiscoveryService.class); private static final Logger LOG = LoggerFactory.getLogger(EntityDiscoveryService.class);
private static final String DEFAULT_SORT_ATTRIBUTE_NAME = "name"; private static final String DEFAULT_SORT_ATTRIBUTE_NAME = "name";
private static final String SORT_ATTRIBUTE_NAME = "sortAttributeName";
private final AtlasGraph graph; private final AtlasGraph graph;
private final EntityGraphRetriever entityRetriever; private final EntityGraphRetriever entityRetriever;
...@@ -594,7 +595,7 @@ public class EntityDiscoveryService implements AtlasDiscoveryService { ...@@ -594,7 +595,7 @@ public class EntityDiscoveryService implements AtlasDiscoveryService {
sortByAttributeName = null; sortByAttributeName = null;
sortOrder = null; sortOrder = null;
} else { } else {
sortByAttributeName = sortByAttribute.getQualifiedName(); sortByAttributeName = sortByAttribute.getVertexPropertyName();
if (sortOrder == null) { if (sortOrder == null) {
sortOrder = ASCENDING; sortOrder = ASCENDING;
...@@ -613,11 +614,11 @@ public class EntityDiscoveryService implements AtlasDiscoveryService { ...@@ -613,11 +614,11 @@ public class EntityDiscoveryService implements AtlasDiscoveryService {
if (sortOrder == ASCENDING) { if (sortOrder == ASCENDING) {
relatedEntitiesQuery += gremlinQueryProvider.getQuery(RELATIONSHIP_SEARCH_ASCENDING_SORT); relatedEntitiesQuery += gremlinQueryProvider.getQuery(RELATIONSHIP_SEARCH_ASCENDING_SORT);
bindings.put("sortAttributeName", sortByAttributeName); bindings.put(SORT_ATTRIBUTE_NAME, sortByAttributeName);
} else if (sortOrder == DESCENDING) { } else if (sortOrder == DESCENDING) {
relatedEntitiesQuery += gremlinQueryProvider.getQuery(RELATIONSHIP_SEARCH_DESCENDING_SORT); relatedEntitiesQuery += gremlinQueryProvider.getQuery(RELATIONSHIP_SEARCH_DESCENDING_SORT);
bindings.put("sortAttributeName", sortByAttributeName); bindings.put(SORT_ATTRIBUTE_NAME, sortByAttributeName);
} }
relatedEntitiesQuery += gremlinQueryProvider.getQuery(TO_RANGE_LIST); relatedEntitiesQuery += gremlinQueryProvider.getQuery(TO_RANGE_LIST);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment