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 searchapi (5.2.1) to 5.2.N (5.2.1)

Browse Source 
130052 gjames: SEARCH-161: Removed support for synonyms on SORT fieldNames


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130299 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2016-09-06 15:38:57 +00:00
parent 2ae8c3f90d
commit 912123029d
2 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -182,8 +182,7 @@ public class SearchMapper
{ {
SortType sortType = SortType.valueOf(sortDef.getType()); SortType sortType = SortType.valueOf(sortDef.getType());
String field = sortDef.getField(); String field = sortDef.getField();
QName propQname = PARAM_SYNONYMS_QNAME.get(field); sp.addSort(new SortDefinition(sortType, field, sortDef.isAscending()));
sp.addSort(new SortDefinition(sortType, propQname==null?field:propQname.toString(), sortDef.isAscending()));
} }
catch (IllegalArgumentException e) catch (IllegalArgumentException e)
{ {

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

@@ -194,23 +194,6 @@ public class SearchMapperTests
} }
}); });
searchParameters = new SearchParameters();
searchMapper.fromSort(searchParameters, Arrays.asList(new SortDef("FIELD", "createdAt", true)));
assertEquals(1 , searchParameters.getSortDefinitions().size());
assertEquals("{http://www.alfresco.org/model/content/1.0}created", searchParameters.getSortDefinitions().get(0).getField());
searchParameters = new SearchParameters();
searchMapper.fromSort(searchParameters, Arrays.asList(new SortDef("FIELD", "cm:created", true)));
assertEquals("cm:created", searchParameters.getSortDefinitions().get(0).getField());
searchParameters = new SearchParameters();
searchMapper.fromSort(searchParameters, Arrays.asList(new SortDef("FIELD", "modifiedByUser", true)));
assertEquals("{http://www.alfresco.org/model/content/1.0}modifier", searchParameters.getSortDefinitions().get(0).getField());
searchParameters = new SearchParameters();
searchMapper.fromSort(searchParameters, Arrays.asList(new SortDef("FIELD", "nodeType", true)));
assertEquals("{}TYPE", searchParameters.getSortDefinitions().get(0).getField());
searchParameters = new SearchParameters(); searchParameters = new SearchParameters();
searchParameters.setLanguage(SearchService.LANGUAGE_CMIS_ALFRESCO); searchParameters.setLanguage(SearchService.LANGUAGE_CMIS_ALFRESCO);
try try