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 RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)

Browse Source 
129004 adavis: REPO-243 People Live Search
      - First cut of this code
      - Includes a re-factor of the code used by GET /queries/live-search-nodes as there is much in common.
      - Still have some tests to write and there are bound to be comments from the review.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129187 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Martin Muller
2016-08-05 13:49:15 +00:00
parent 15f33e6130
commit 83e9fdf964
10 changed files with 906 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/java/org/alfresco/rest/api/queries/QueriesEntityResource.java
View File

@@ -26,8 +26,8 @@
package org.alfresco.rest.api.queries;
import org.alfresco.rest.api.Queries;
import org.alfresco.rest.api.model.Node;
import org.alfresco.rest.framework.WebApiDescription;
import org.alfresco.rest.framework.core.exceptions.NotFoundException;
import org.alfresco.rest.framework.resource.EntityResource;
import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
@@ -41,8 +41,13 @@ import org.springframework.beans.factory.InitializingBean;
* @author janv
*/
@EntityResource(name="queries", title = "Queries")
public class QueriesEntityResource implements EntityResourceAction.ReadById<CollectionWithPagingInfo<Node>>, InitializingBean
public class QueriesEntityResource implements
EntityResourceAction.ReadById<CollectionWithPagingInfo<? extends Object>>,
InitializingBean
{
private final static String QUERY_LIVE_SEARCH_NODES = "live-search-nodes";
private final static String QUERY_LIVE_SEARCH_PEOPLE = "live-search-people";
private Queries queries;
public void setQueries(Queries queries)
@@ -59,8 +64,16 @@ public class QueriesEntityResource implements EntityResourceAction.ReadById<Coll
// hmm - a little unorthodox
@Override
@WebApiDescription(title="Find results", description = "Find & list search results for given query id")
public CollectionWithPagingInfo<Node> readById(String queryId, Parameters parameters)
public CollectionWithPagingInfo<? extends Object> readById(String queryId, Parameters parameters)
{
return queries.findNodes(queryId, parameters);
switch (queryId)
{
case QUERY_LIVE_SEARCH_NODES:
return queries.findNodes(parameters);
case QUERY_LIVE_SEARCH_PEOPLE:
return queries.findPeople(parameters);
default:
throw new NotFoundException(queryId);
}
}
}