From b016cda1b409b30bb2117c0e53f648e7b9d59395 Mon Sep 17 00:00:00 2001 From: Gethin James Date: Thu, 1 Jun 2017 11:13:17 +0000 Subject: [PATCH] Merged searchrep (5.2.1) to 5.2.N (5.2.1) 136987 msuzuki: Search-340, updated SearchMapper to work with latest data model change git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137079 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/rest/api/search/impl/SearchMapper.java | 1 - .../org/alfresco/rest/api/search/SearchMapperTests.java | 2 -- 2 files changed, 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 f27a611537..a6073e56d1 100644 --- a/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java +++ b/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java @@ -117,7 +117,6 @@ public class SearchMapper SearchParameters sp = new SearchParameters(); setDefaults(sp); - sp.setFacetFormat(searchQuery.getFacetFormat()); fromLocalization(sp, searchQuery.getLocalization()); fromQuery(sp, searchQuery.getQuery()); fromPaging(sp, params.getPaging()); 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 b4feb8e3da..350570f557 100644 --- a/source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java +++ b/source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java @@ -116,7 +116,6 @@ public class SearchMapperTests searchParameters = searchMapper.toSearchParameters(ResultMapperTests.EMPTY_PARAMS, helper.searchQueryFromJson(), searchRequest); assertNotNull(searchParameters); - assertEquals(null, searchParameters.getFacetFormat()); } @Test @@ -1032,7 +1031,6 @@ public class SearchMapperTests assertEquals("workspaces store is the default", StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, searchParameters.getStores().get(0)); assertEquals(LimitBy.FINAL_SIZE, searchParameters.getLimitBy()); assertEquals(100, searchParameters.getLimit()); - assertEquals(FacetFormat.V2, searchParameters.getFacetFormat()); }