From 6db87e1e5a5db4496e4b7ec69f769326d072dbe4 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Thu, 3 Nov 2016 13:10:36 +0000
Subject: [PATCH] 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
---
 .../alfresco/rest/api/search/impl/SearchMapper.java |  6 ++++++
 .../alfresco/rest/api/search/SearchMapperTests.java | 13 ++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java b/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java
index e963b9545d..a667e025d0 100644
--- a/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java
+++ b/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java
@@ -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());
diff --git a/source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java b/source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java
index 5d27cce533..1f3bb3ee4b 100644
--- a/source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java
+++ b/source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java
@@ -312,7 +312,18 @@ public class SearchMapperTests
         assertEquals("hedgehog" ,searchParameters.getFilterQueries().get(0));
         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