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 5.2.N (5.2.1) to HEAD (5.2)

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -283,6 +283,12 @@ public class SearchMapper
{ {
if (filterQueries != null && !filterQueries.isEmpty()) 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) for (FilterQuery fq:filterQueries)
{ {
ParameterCheck.mandatoryString("filterQueries query", fq.getQuery()); ParameterCheck.mandatoryString("filterQueries query", fq.getQuery());

13
source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java
View File

@@ -312,7 +312,18 @@ public class SearchMapperTests
assertEquals("hedgehog" ,searchParameters.getFilterQueries().get(0)); assertEquals("hedgehog" ,searchParameters.getFilterQueries().get(0));
assertEquals("king" ,searchParameters.getFilterQueries().get(1)); assertEquals("king" ,searchParameters.getFilterQueries().get(1));
//tags aren't used at the moment searchParameters = new SearchParameters();
searchParameters.setLanguage(SearchService.LANGUAGE_CMIS_ALFRESCO);
try
{
searchMapper.fromFilterQuery(searchParameters, Arrays.asList(new FilterQuery("hedgehog", null)));
fail();
}
catch (InvalidArgumentException iae)
{
//You can't specify FilterQuery when using the CMIS language
assertNotNull(iae);
}
} }
@Test @Test