From be1ae9146e8144493fb5b927ac327b87e7ad7f0c Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 6 Sep 2016 22:09:59 +0000 Subject: [PATCH] Merged 5.2.N (5.2.1) to HEAD (5.2) 130294 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1) 130038 gjames: SEARCH-158: Limit results by a final size of 100 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130366 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../java/org/alfresco/rest/api/search/impl/SearchMapper.java | 2 ++ .../org/alfresco/rest/api/search/SearchMapperTests.java | 4 ++++ 2 files changed, 6 insertions(+) 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 786f4db9a4..11a50c1330 100644 --- a/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java +++ b/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java @@ -106,6 +106,8 @@ public class SearchMapper { //Hardcode workspace store sp.addStore(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE); + sp.setLimitBy(LimitBy.FINAL_SIZE); + sp.setMaxItems(100); } /** 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 1cfdda9e2e..5b3d7ea740 100644 --- a/source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java +++ b/source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java @@ -44,6 +44,7 @@ import org.alfresco.rest.api.search.model.Template; import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException; 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.junit.Test; @@ -75,6 +76,8 @@ public class SearchMapperTests //Test defaults assertEquals("There should be only 1 default store", 1,searchParameters.getStores().size()); assertEquals("workspaces store is the default", StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, searchParameters.getStores().get(0)); + assertEquals(LimitBy.FINAL_SIZE, searchParameters.getLimitBy()); + assertEquals(100, searchParameters.getMaxItems()); searchParameters = searchMapper.toSearchParameters(helper.searchQueryFromJson()); assertNotNull(searchParameters); @@ -141,6 +144,7 @@ public class SearchMapperTests SearchParameters searchParameters = new SearchParameters(); //Doesn't error searchMapper.fromPaging(searchParameters, null); + Paging paging = Paging.DEFAULT; searchMapper.fromPaging(searchParameters, paging); assertEquals(searchParameters.getMaxItems(),paging.getMaxItems());