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

130507 gjames: SEARCH-166:Filter queries should not be supported with CMIS QL


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132138 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-11-03 13:10:36 +00:00
parent 976b860eff
commit 6db87e1e5a
2 changed files with 18 additions and 1 deletions

View File

@@ -283,6 +283,12 @@ public class SearchMapper
{
if (filterQueries != null && !filterQueries.isEmpty())
{
if (LANGUAGE_CMIS_ALFRESCO.equals(sp.getLanguage()))
{
throw new InvalidArgumentException(InvalidArgumentException.DEFAULT_MESSAGE_ID,
new Object[] { ": filterQueries {} not allowed with cmis language" });
}
for (FilterQuery fq:filterQueries)
{
ParameterCheck.mandatoryString("filterQueries query", fq.getQuery());