From 5c7fe2d39b13271f4944ee7e85386740f0e6500a Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 6 Sep 2016 22:10:34 +0000 Subject: [PATCH] Merged 5.2.N (5.2.1) to HEAD (5.2) 130298 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1) 130051 gjames: SEARCH-159: Don't allow sort for cmis_alfresco language git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130370 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../java/org/alfresco/rest/api/search/impl/SearchMapper.java | 2 +- .../org/alfresco/rest/api/search/SearchMapperTests.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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 c4fce0adee..5fb623355c 100644 --- a/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java +++ b/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java @@ -170,7 +170,7 @@ public class SearchMapper { if (sort != null && !sort.isEmpty()) { - if (CMIS.equals(sp.getLanguage())) + if (LANGUAGE_CMIS_ALFRESCO.equals(sp.getLanguage())) { throw new InvalidArgumentException(InvalidArgumentException.DEFAULT_MESSAGE_ID, new Object[] { ": sort {} not allowed with cmis language" }); 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 bdb2cfa8bc..ae55b7eed9 100644 --- a/source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java +++ b/source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java @@ -46,6 +46,7 @@ import org.alfresco.rest.framework.resource.parameters.Paging; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.search.LimitBy; import org.alfresco.service.cmr.search.SearchParameters; +import org.alfresco.service.cmr.search.SearchService; import org.junit.Test; import java.util.Arrays; @@ -211,7 +212,7 @@ public class SearchMapperTests assertEquals("{}TYPE", searchParameters.getSortDefinitions().get(0).getField()); searchParameters = new SearchParameters(); - searchParameters.setLanguage(SearchMapper.CMIS); + searchParameters.setLanguage(SearchService.LANGUAGE_CMIS_ALFRESCO); try { searchMapper.fromSort(searchParameters, Arrays.asList(new SortDef("FIELD", null, false)));