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

Added orderBy param for PUBLICAPI-33, needed for the workflow rest api.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54571 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2013-08-28 13:06:59 +00:00
parent 6095193ac2
commit 36b5548a56
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/java/org/alfresco/rest/framework/resource/parameters/Parameters.java
View File

@@ -44,6 +44,13 @@ public interface Parameters
*/ */
public Paging getPaging(); public Paging getPaging();
/**
* Returns a List of {@link SortColumn} for sorting properties.
* Specified by the "orderBy" request parameter.
* @return List of {@link SortColumn}
*/
public List<SortColumn> getSorting();
/** /**
* Returns a {@link BeanPropertiesFilter} for filtering out properties. * Returns a {@link BeanPropertiesFilter} for filtering out properties.
* Specified by the "properties" request parameter. * Specified by the "properties" request parameter.

7
source/java/org/alfresco/rest/framework/resource/parameters/Params.java
View File

@@ -177,6 +177,12 @@ public class Params implements Parameters
return (addressedProperty != null && addressedProperty.equals(propertyName)); return (addressedProperty != null && addressedProperty.equals(propertyName));
} }
@Override
public List<SortColumn> getSorting()
{
return recognizedParams.sorting;
}
@Override @Override
public String getBinaryProperty() public String getBinaryProperty()
{ {
@@ -207,6 +213,7 @@ public class Params implements Parameters
private final List<String> select; private final List<String> select;
private final List<SortColumn> sorting; private final List<SortColumn> sorting;
@SuppressWarnings("unchecked")
public RecognizedParams(Map<String, String[]> requestParameters, Paging paging, BeanPropertiesFilter filter, Map<String, BeanPropertiesFilter> relationshipFilter, List<String> select, public RecognizedParams(Map<String, String[]> requestParameters, Paging paging, BeanPropertiesFilter filter, Map<String, BeanPropertiesFilter> relationshipFilter, List<String> select,
Query query, List<SortColumn> sorting) Query query, List<SortColumn> sorting)
{ {

6
source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptHelper.java
View File

@@ -70,10 +70,10 @@ public class ResourceWebScriptHelper
public static final String PARAM_FILTER_PROPS = "properties"; public static final String PARAM_FILTER_PROPS = "properties";
public static final String PARAM_PAGING_SKIP = "skipCount"; public static final String PARAM_PAGING_SKIP = "skipCount";
public static final String PARAM_PAGING_MAX = "maxItems"; public static final String PARAM_PAGING_MAX = "maxItems";
public static final String PARAM_SORT = "sort"; public static final String PARAM_ORDERBY = "orderBy";
public static final String PARAM_WHERE = "where"; public static final String PARAM_WHERE = "where";
public static final String PARAM_SELECT = "select"; public static final String PARAM_SELECT = "select";
public static final List<String> KNOWN_PARAMS = Arrays.asList(PARAM_RELATIONS,PARAM_FILTER_PROPS,PARAM_PAGING_SKIP,PARAM_PAGING_MAX, PARAM_SORT, PARAM_WHERE, PARAM_SELECT); public static final List<String> KNOWN_PARAMS = Arrays.asList(PARAM_RELATIONS,PARAM_FILTER_PROPS,PARAM_PAGING_SKIP,PARAM_PAGING_MAX, PARAM_ORDERBY, PARAM_WHERE, PARAM_SELECT);
private ResourceLocator locator; private ResourceLocator locator;
@@ -605,7 +605,7 @@ public class ResourceWebScriptHelper
public static RecognizedParams getRecognizedParams(WebScriptRequest req) public static RecognizedParams getRecognizedParams(WebScriptRequest req)
{ {
Paging paging = findPaging(req); Paging paging = findPaging(req);
List<SortColumn> sorting = getSort(req.getParameter(ResourceWebScriptHelper.PARAM_SORT)); List<SortColumn> sorting = getSort(req.getParameter(ResourceWebScriptHelper.PARAM_ORDERBY));
Map<String, BeanPropertiesFilter> relationFilter = getRelationFilter(req.getParameter(ResourceWebScriptHelper.PARAM_RELATIONS)); Map<String, BeanPropertiesFilter> relationFilter = getRelationFilter(req.getParameter(ResourceWebScriptHelper.PARAM_RELATIONS));
BeanPropertiesFilter filter = getFilter(req.getParameter(ResourceWebScriptHelper.PARAM_FILTER_PROPS)); BeanPropertiesFilter filter = getFilter(req.getParameter(ResourceWebScriptHelper.PARAM_FILTER_PROPS));
Query whereQuery = getWhereClause(req.getParameter(ResourceWebScriptHelper.PARAM_WHERE)); Query whereQuery = getWhereClause(req.getParameter(ResourceWebScriptHelper.PARAM_WHERE));