aditya-gupta36 commented on code in PR #373:
URL: https://github.com/apache/atlas/pull/373#discussion_r2197323971
##########
webapp/src/main/java/org/apache/atlas/web/rest/DiscoveryREST.java:
##########
@@ -892,27 +892,48 @@ private void validateSearchParameters(SearchParameters
parameters) throws AtlasB
private void validateEntityFilter(SearchParameters parameters) throws
AtlasBaseException {
FilterCriteria entityFilter = parameters.getEntityFilters();
+ FilterCriteria tagFilter = parameters.getTagFilters();
- if (entityFilter == null) {
- return;
+ if (isNotEmpty(entityFilter) ) {
+ validateNestedCriteria(entityFilter);
}
- if (entityFilter.getCriterion() != null &&
- !entityFilter.getCriterion().isEmpty()) {
- if (entityFilter.getCondition() == null ||
StringUtils.isEmpty(entityFilter.getCondition().toString())) {
+ if (isNotEmpty(tagFilter)) {
+ validateNestedCriteria(tagFilter);
+ }
+ }
+
+ private boolean isNotEmpty(FilterCriteria filter) {
+ if (filter == null) {
+ return false;
+ }
+
+ if (filter.getAttributeName() != null && filter.getOperator() != null
&& filter.getAttributeValue() != null) {
Review Comment:
//here: correct request
curl --location --request POST
'http://localhost:21000/api/atlas/v2/search/basic' \
--header 'Content-Type: application/json' \
--header 'Authorization: Basic YWRtaW46YWRtaW4=' \
--data-raw
'{"excludeDeletedEntities":true,"includeSubClassifications":true,"includeSubTypes":true,"includeClassificationAttributes":true,"entityFilters":{"condition":"AND","criterion":[{"attributeName":"__guid","operator":"eq","attributeValue":"wdsewsafcaews"},{"condition":"AND","criterion":[{"attributeName":"__modificationTimestamp","operator":"eq","attributeValue":"1752141624000"}]}]},"tagFilters":{"condition":"AND","criterion":[{"attributeName":"__timestamp","operator":"eq","attributeValue":"1752141282000"},{"condition":"AND","criterion":[{"attributeName":"__modifiedBy","operator":"eq","attributeValue":"sadw"},{"condition":"AND","criterion":[{"attributeName":"__modificationTimestamp","operator":"eq","attributeValue":"1752141696000"}]}]},{"attributeName":"__timestamp","operator":"eq","attributeValue":"1752141282000"}]},"attributes":["__guid","__modificationTimestamp"],"limit":25,"offset":0,"typeName":"_ALL_ENTITY_TYPES","classification":"_ALL_CLASSIFICATION_TYPES","termName":nu
ll}'
//here: negative scenario request. Sending empty object(non null), In this
case, it was throwing exception if we dont handle with helper method.
curl --location --request POST
'http://localhost:21000/api/atlas/v2/search/basic' \
--header 'Content-Type: application/json' \
--header 'Authorization: Basic YWRtaW46YWRtaW4=' \
--data-raw
'{"excludeDeletedEntities":true,"includeSubClassifications":true,"includeSubTypes":true,"includeClassificationAttributes":true,"entityFilters":{},"tagFilters":{},"attributes":["__guid","__modificationTimestamp"],"limit":25,"offset":0,"typeName":"_ALL_ENTITY_TYPES","classification":"_ALL_CLASSIFICATION_TYPES","termName":null}'
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
