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

Browse Source 
126473 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122418 gjames: RA-827 Supporting custom status codes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126817 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 11:36:03 +00:00
parent 88b0a9159f
commit e1d542438c
19 changed files with 239 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/java/org/alfresco/rest/framework/resource/actions/ActionExecutor.java
View File

@@ -29,6 +29,7 @@ import org.alfresco.rest.framework.core.HttpMethodSupport;
import org.alfresco.rest.framework.core.ResourceWithMetadata;
import org.alfresco.rest.framework.resource.content.ContentInfo;
import org.alfresco.rest.framework.resource.parameters.Params;
import org.springframework.extensions.webscripts.Status;
/**
* Executes an action in the system
@@ -54,7 +55,7 @@ public interface ActionExecutor extends HttpMethodSupport
*/
public interface ExecutionCallback<R>
{
public void onSuccess(R result, ContentInfo contentInfo);
public void onSuccess(R result, ContentInfo contentInfo, int statusCode);
}
}

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

@@ -117,11 +117,4 @@ public interface Parameters
* @return BasicContentInfo the content info
*/
BasicContentInfo getContentInfo();
/**
* Gets Web Script status
*
* @return {@link Status}
*/
public Status getStatus();
}

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

@@ -55,7 +55,6 @@ public class Params implements Parameters
private final RecognizedParams recognizedParams;
private final String addressedProperty;
private final BasicContentInfo contentInfo;
private final Status status;
//Constants
private static final RecognizedParams NULL_PARAMS = new RecognizedParams(null, null, null, null, null, null, null, false);
@@ -71,7 +70,6 @@ public class Params implements Parameters
this.recognizedParams = recognizedParams;
this.addressedProperty = addressedProperty;
this.contentInfo = contentInfo==null?DEFAULT_CONTENT_INFO:contentInfo;
this.status = new Status();
}
public static Params valueOf(BeanPropertiesFilter paramFilter, String entityId)
@@ -241,12 +239,6 @@ public class Params implements Parameters
return contentInfo;
}
@Override
public Status getStatus()
{
return status;
}
/**
* A formal set of params that any rest service could potentially have passed in as request params
*/