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

132107 gjames: SEARCH-227: Adding additional display information for facetting api


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132335 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-11-03 14:04:21 +00:00
parent 0e5f80f4eb
commit d6e678d2c2
11 changed files with 362 additions and 17 deletions

View File

@@ -66,7 +66,6 @@ public class SearchApiWebscript extends AbstractWebScript implements RecognizedP
{
private ServiceRegistry serviceRegistry;
private SearchService searchService;
private Nodes nodes;
private SearchMapper searchMapper;
private ResultMapper resultMapper;
protected ApiAssistant assistant;
@@ -78,10 +77,8 @@ public class SearchApiWebscript extends AbstractWebScript implements RecognizedP
PropertyCheck.mandatory(this, "serviceRegistry", serviceRegistry);
this.searchService = serviceRegistry.getSearchService();
ParameterCheck.mandatory("assistant", this.assistant);
ParameterCheck.mandatory("nodes", this.nodes);
searchMapper = new SearchMapper();
resultMapper = new ResultMapper(nodes);
}
@Override
@@ -145,8 +142,9 @@ public class SearchApiWebscript extends AbstractWebScript implements RecognizedP
return Params.valueOf(null, recognizedParams, null, webScriptRequest);
}
public void setNodes(Nodes nodes) {
this.nodes = nodes;
public void setResultMapper(ResultMapper resultMapper)
{
this.resultMapper = resultMapper;
}
public void setAssistant(ApiAssistant assistant) {