inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
130287 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      130026 gjames: SEARCH-119: Implementing filter queries (without tags)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130359 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-09-06 22:08:57 +00:00
parent f6b366cb01
commit a699adbe2f
6 changed files with 115 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/java/org/alfresco/rest/api/search/impl/SearchMapper.java
View File

@@ -27,6 +27,7 @@
package org.alfresco.rest.api.search.impl;
import org.alfresco.rest.api.search.model.Default;
import org.alfresco.rest.api.search.model.FilterQuery;
import org.alfresco.rest.api.search.model.Query;
import org.alfresco.rest.api.search.model.SearchQuery;
import org.alfresco.rest.api.search.model.SortDef;
@@ -90,6 +91,7 @@ public class SearchMapper
fromTemplate(sp, searchQuery.getTemplates());
validateInclude(searchQuery.getInclude());
fromDefault(sp, searchQuery.getDefaults());
fromFilterQuery(sp, searchQuery.getFilterQueries());
return sp;
}
@@ -238,4 +240,21 @@ public class SearchMapper
}
}
/**
** SearchParameters from List<FilterQuery>
* @param sp
* @param filterQueries
*/
public void fromFilterQuery(SearchParameters sp, List<FilterQuery> filterQueries)
{
if (filterQueries != null && !filterQueries.isEmpty())
{
for (FilterQuery fq:filterQueries)
{
sp.addFilterQuery(fq.getQuery());
}
}
}
}