inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged searchrep (5.2.1) to 5.2.N (5.2.1)

Browse Source 
137024 msuzuki: Search-426, align response of V1 with grouping to be the same as V2


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137090 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2017-06-01 11:23:21 +00:00
parent 1bdcba877f
commit 6ab1ea5634
2 changed files with 75 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/java/org/alfresco/rest/api/search/impl/ResultMapper.java
View File

@@ -305,7 +305,7 @@ public class ResultMapper
{
//If group by field populated in query facet return bucketing into facet field.
List<GenericFacetResponse> facetQueryForFields = getFacetBucketsFromFacetQueries(facetQueries,searchQuery);
if(!facetQueryForFields.isEmpty() || FacetFormat.V2 == searchQuery.getFacetFormat())
if(hasGroup(searchQuery) || FacetFormat.V2 == searchQuery.getFacetFormat())
{
facets.addAll(facetQueryForFields);
}
@@ -359,6 +359,14 @@ public class ResultMapper
context = new SearchContext(solrResultSet.getLastIndexedTxId(), facets, facetResults, ffcs, spellCheckContext, searchRequestContext.includeRequest()?searchQuery:null);
return isNullContext(context)?null:context;
}
public static boolean hasGroup(SearchQuery searchQuery)
{
if(searchQuery != null && searchQuery.getFacetQueries() != null)
{
return searchQuery.getFacetQueries().stream().anyMatch(facetQ -> facetQ.getGroup() != null);
}
return false;
}
/**
* Builds a facet field from facet queries.
* @param facetQueries
@@ -382,8 +390,8 @@ public class ResultMapper
group = found.get().getGroup();
}
}
if(group != null && !group.isEmpty() || FacetFormat.V2 == searchQuery.getFacetFormat())
{
// if(group != null && !group.isEmpty() || FacetFormat.V2 == searchQuery.getFacetFormat())
// {
if(groups.containsKey(group))
{
Set<Metric> metrics = new HashSet<>(1);
@@ -399,7 +407,7 @@ public class ResultMapper
groups.put(group, l);
}
}
}
// }
if(!groups.isEmpty())
{
groups.forEach((a,v) -> facetResults.add(new GenericFacetResponse(FACET_TYPE.query, a, v)));