Merged 5.2.N (5.2.2) to HEAD (5.2)

136083 gjames: Merged searchbcr (5.2.1) to 5.2.N (5.2.1)
      135513 gjames: SEARCH-372: Adding filterQuery to facetQueries result


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137455 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrei Rebegea
2017-06-15 10:58:58 +00:00
parent 867026b9a2
commit 3b7bcc199a

View File

@@ -281,7 +281,7 @@ public class ResultMapper
if (searchQuery != null)
{
Optional<FacetQuery> found = searchQuery.getFacetQueries().stream().filter(facetQuery -> fq.getKey().equals(facetQuery.getLabel())).findFirst();
if (found.isPresent()) filterQuery = found.get().getQuery();
filterQuery = found.isPresent()? found.get().getQuery():fq.getKey();
}
facetResults.add(new FacetQueryContext(fq.getKey(), filterQuery, fq.getValue()));
}