inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.2.N (5.2.2) to HEAD (5.2)

Browse Source 
137079 gjames: 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/HEAD/root@137594 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrei Rebegea
2017-06-15 11:18:22 +00:00
parent 7ef0ef8679
commit 04d3265f3a
2 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/java/org/alfresco/rest/api/search/impl/SearchMapper.java
View File

@@ -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());

2
source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java
View File

@@ -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());
}