From cd362c3c7565df2696b61ae20a57b1e27d960056 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 6 Sep 2016 22:05:13 +0000 Subject: [PATCH] Merged 5.2.N (5.2.1) to HEAD (5.2) 130183 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1) 129823 gjames: SEARCH-113: Clearer default parameters git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130334 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../rest/api/search/impl/SearchMapper.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 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 7cbbe56e2a..7266d8696b 100644 --- a/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java +++ b/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java @@ -77,13 +77,23 @@ public class SearchMapper ParameterCheck.mandatory("query", searchQuery.getQuery()); SearchParameters sp = new SearchParameters(); + setDefaults(sp); + fromQuery(sp, searchQuery.getQuery()); fromPaging(sp, searchQuery.getPaging()); validateInclude(searchQuery.getInclude()); + return sp; + } + + /** + * Sets the API defaults + * @param sp + */ + protected void setDefaults(SearchParameters sp) + { //Hardcode workspace store sp.addStore(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE); - return sp; } /** @@ -134,8 +144,7 @@ public class SearchMapper { if (!PERMITTED_INCLUDES.contains(inc)) { - throw new InvalidArgumentException(InvalidArgumentException.DEFAULT_MESSAGE_ID, - new Object[] { inc }); + throw new InvalidArgumentException(InvalidArgumentException.DEFAULT_MESSAGE_ID, new Object[] { inc }); } }