diff --git a/source/java/org/alfresco/rest/api/nodes/NodeChildrenRelation.java b/source/java/org/alfresco/rest/api/nodes/NodeChildrenRelation.java index f3f525413d..2ed420cae0 100644 --- a/source/java/org/alfresco/rest/api/nodes/NodeChildrenRelation.java +++ b/source/java/org/alfresco/rest/api/nodes/NodeChildrenRelation.java @@ -30,7 +30,7 @@ import org.alfresco.rest.framework.resource.actions.interfaces.MultiPartRelation import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction; import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo; import org.alfresco.rest.framework.resource.parameters.Parameters; -import org.alfresco.rest.framework.webscripts.ResponseCallBack; +import org.alfresco.rest.framework.webscripts.WithResponse; import org.alfresco.util.ParameterCheck; import org.springframework.beans.factory.InitializingBean; import org.springframework.extensions.webscripts.servlet.FormData; @@ -113,7 +113,7 @@ public class NodeChildrenRelation implements RelationshipResourceAction.Read extends ResourceAction { - public E create(String entityResourceId, FormData formData, Parameters parameters, ResponseCallBack withResponse); + public E create(String entityResourceId, FormData formData, Parameters parameters, WithResponse withResponse); } } diff --git a/source/java/org/alfresco/rest/framework/resource/actions/interfaces/MultiPartResourceAction.java b/source/java/org/alfresco/rest/framework/resource/actions/interfaces/MultiPartResourceAction.java index 300de3aa3e..6ae0ef3af4 100644 --- a/source/java/org/alfresco/rest/framework/resource/actions/interfaces/MultiPartResourceAction.java +++ b/source/java/org/alfresco/rest/framework/resource/actions/interfaces/MultiPartResourceAction.java @@ -20,7 +20,7 @@ package org.alfresco.rest.framework.resource.actions.interfaces; import org.alfresco.rest.framework.resource.parameters.Parameters; -import org.alfresco.rest.framework.webscripts.ResponseCallBack; +import org.alfresco.rest.framework.webscripts.WithResponse; import org.springframework.extensions.webscripts.servlet.FormData; /** @@ -34,6 +34,6 @@ public interface MultiPartResourceAction */ public static interface Create extends ResourceAction { - public E create(FormData formData, Parameters parameters, ResponseCallBack withResponse); + public E create(FormData formData, Parameters parameters, WithResponse withResponse); } } diff --git a/source/java/org/alfresco/rest/framework/webscripts/AbstractResourceWebScript.java b/source/java/org/alfresco/rest/framework/webscripts/AbstractResourceWebScript.java index e7dcbc6d8b..098d809239 100644 --- a/source/java/org/alfresco/rest/framework/webscripts/AbstractResourceWebScript.java +++ b/source/java/org/alfresco/rest/framework/webscripts/AbstractResourceWebScript.java @@ -145,7 +145,7 @@ public abstract class AbstractResourceWebScript extends ApiWebScript implements { final String entityCollectionName = ResourceInspector.findEntityCollectionNameName(resource.getMetaData()); final ResourceOperation operation = resource.getMetaData().getOperation(getHttpMethod()); - final ResponseCallBack callBack = new ResponseCallBack(operation.getSuccessStatus(),DEFAULT_JSON_CONTENT,ApiWebScript.CACHE_NEVER); + final WithResponse callBack = new WithResponse(operation.getSuccessStatus(),DEFAULT_JSON_CONTENT,ApiWebScript.CACHE_NEVER); Object toReturn = transactionService.getRetryingTransactionHelper().doInTransaction( new RetryingTransactionHelper.RetryingTransactionCallback() { @@ -210,7 +210,7 @@ public abstract class AbstractResourceWebScript extends ApiWebScript implements setContentInfoOnResponse(res,contentInfo); } - protected void setResponse(final WebScriptResponse res, ResponseCallBack withResponse) + protected void setResponse(final WebScriptResponse res, WithResponse withResponse) { setResponse(res, withResponse.getStatus(), withResponse.getCache(), withResponse.getContentInfo(), withResponse.getHeaders()); } diff --git a/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptDelete.java b/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptDelete.java index f5b378e169..bc28e7888c 100644 --- a/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptDelete.java +++ b/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptDelete.java @@ -89,7 +89,7 @@ public class ResourceWebScriptDelete extends AbstractResourceWebScript implement * @return anObject the result of the execute */ @Override - public Object executeAction(ResourceWithMetadata resource, Params params, ResponseCallBack withResponse) + public Object executeAction(ResourceWithMetadata resource, Params params, WithResponse withResponse) { switch (resource.getMetaData().getType()) { @@ -143,7 +143,7 @@ public class ResourceWebScriptDelete extends AbstractResourceWebScript implement public Void execute(final ResourceWithMetadata resource, final Params params, final WebScriptResponse res, boolean isReadOnly) { final ResourceOperation operation = resource.getMetaData().getOperation(HttpMethod.DELETE); - final ResponseCallBack callBack = new ResponseCallBack(operation.getSuccessStatus(),DEFAULT_JSON_CONTENT,ApiWebScript.CACHE_NEVER); + final WithResponse callBack = new WithResponse(operation.getSuccessStatus(),DEFAULT_JSON_CONTENT,ApiWebScript.CACHE_NEVER); transactionService.getRetryingTransactionHelper().doInTransaction( new RetryingTransactionCallback() { diff --git a/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptGet.java b/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptGet.java index be7b98f906..6288912b63 100644 --- a/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptGet.java +++ b/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptGet.java @@ -18,11 +18,8 @@ */ package org.alfresco.rest.framework.webscripts; -import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; -import org.alfresco.rest.framework.core.ResourceInspector; import org.alfresco.rest.framework.core.ResourceLocator; import org.alfresco.rest.framework.core.ResourceMetadata; -import org.alfresco.rest.framework.core.ResourceOperation; import org.alfresco.rest.framework.core.ResourceWithMetadata; import org.alfresco.rest.framework.core.exceptions.DeletedResourceException; import org.alfresco.rest.framework.core.exceptions.UnsupportedResourceOperationException; @@ -33,17 +30,13 @@ import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAct import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction; import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceBinaryAction; import org.alfresco.rest.framework.resource.content.BinaryResource; -import org.alfresco.rest.framework.resource.content.ContentInfo; -import org.alfresco.rest.framework.resource.content.NodeBinaryResource; import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo; import org.alfresco.rest.framework.resource.parameters.Params; import org.alfresco.rest.framework.resource.parameters.Params.RecognizedParams; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.extensions.webscripts.Status; import org.springframework.extensions.webscripts.WebScriptRequest; -import org.springframework.extensions.webscripts.WebScriptResponse; import org.springframework.http.HttpMethod; /** @@ -117,7 +110,7 @@ public class ResourceWebScriptGet extends AbstractResourceWebScript implements P * @return anObject the result of the execute */ @Override - public Object executeAction(ResourceWithMetadata resource, Params params, ResponseCallBack withResponse) throws Throwable + public Object executeAction(ResourceWithMetadata resource, Params params, WithResponse withResponse) throws Throwable { switch (resource.getMetaData().getType()) diff --git a/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptHelper.java b/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptHelper.java index ca5a5633f5..2071a9a8a0 100644 --- a/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptHelper.java +++ b/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptHelper.java @@ -629,7 +629,7 @@ public class ResourceWebScriptHelper paramFilter = filters.get(resourceKey); } final Params executionParams = Params.valueOf(paramFilter, uniqueEntityId, params.getRequest()); - final ResponseCallBack callBack = new ResponseCallBack(Status.STATUS_OK,ApiWebScript.DEFAULT_JSON_CONTENT,ApiWebScript.CACHE_NEVER); + final WithResponse callBack = new WithResponse(Status.STATUS_OK,ApiWebScript.DEFAULT_JSON_CONTENT,ApiWebScript.CACHE_NEVER); //Read only because this only occurs for GET requests Object result = executor.executeAction(resource, executionParams, callBack); return processAdditionsToTheResponse(null, api, null, executionParams, result); diff --git a/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptPost.java b/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptPost.java index 6ba720df44..0f28066288 100644 --- a/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptPost.java +++ b/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptPost.java @@ -22,9 +22,7 @@ package org.alfresco.rest.framework.webscripts; import java.util.Arrays; import java.util.List; -import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.rest.framework.core.OperationResourceMetaData; -import org.alfresco.rest.framework.core.ResourceInspector; import org.alfresco.rest.framework.core.ResourceInspectorUtil; import org.alfresco.rest.framework.core.ResourceLocator; import org.alfresco.rest.framework.core.ResourceMetadata; @@ -42,10 +40,8 @@ import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo; import org.alfresco.rest.framework.resource.parameters.Params; import org.alfresco.rest.framework.resource.parameters.Params.RecognizedParams; import org.apache.commons.lang.StringUtils; -import org.springframework.extensions.webscripts.Status; import org.springframework.extensions.webscripts.WebScriptRequest; import org.springframework.extensions.webscripts.WebScriptRequestImpl; -import org.springframework.extensions.webscripts.WebScriptResponse; import org.springframework.extensions.webscripts.servlet.FormData; import org.springframework.http.HttpMethod; @@ -211,7 +207,7 @@ public class ResourceWebScriptPost extends AbstractResourceWebScript implements * @return anObject the result of the execute */ @Override - public Object executeAction(ResourceWithMetadata resource, Params params, ResponseCallBack withResponse) throws Throwable + public Object executeAction(ResourceWithMetadata resource, Params params, WithResponse withResponse) throws Throwable { final Object resObj = resource.getResource(); diff --git a/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptPut.java b/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptPut.java index be436d9ec4..9d1573b3a4 100644 --- a/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptPut.java +++ b/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptPut.java @@ -24,8 +24,6 @@ import java.io.InputStream; import java.util.Locale; import org.alfresco.repo.content.MimetypeMap; -import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; -import org.alfresco.rest.framework.core.ResourceInspector; import org.alfresco.rest.framework.core.ResourceLocator; import org.alfresco.rest.framework.core.ResourceMetadata; import org.alfresco.rest.framework.core.ResourceOperation; @@ -37,16 +35,13 @@ import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAct import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction; import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceBinaryAction; import org.alfresco.rest.framework.resource.content.BasicContentInfo; -import org.alfresco.rest.framework.resource.content.BinaryResource; import org.alfresco.rest.framework.resource.content.ContentInfoImpl; import org.alfresco.rest.framework.resource.parameters.Params; import org.alfresco.rest.framework.resource.parameters.Params.RecognizedParams; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.extensions.webscripts.Status; import org.springframework.extensions.webscripts.WebScriptRequest; -import org.springframework.extensions.webscripts.WebScriptResponse; import org.springframework.extensions.webscripts.WrappingWebScriptRequest; import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest; import org.springframework.http.HttpMethod; @@ -180,7 +175,7 @@ public class ResourceWebScriptPut extends AbstractResourceWebScript implements P * @return anObject the result of the execute */ @Override - public Object executeAction(ResourceWithMetadata resource, Params params, ResponseCallBack withResponse) throws Throwable + public Object executeAction(ResourceWithMetadata resource, Params params, WithResponse withResponse) throws Throwable { switch (resource.getMetaData().getType()) { diff --git a/source/java/org/alfresco/rest/framework/webscripts/ResponseCallBack.java b/source/java/org/alfresco/rest/framework/webscripts/WithResponse.java similarity index 94% rename from source/java/org/alfresco/rest/framework/webscripts/ResponseCallBack.java rename to source/java/org/alfresco/rest/framework/webscripts/WithResponse.java index 66107b92e2..44c17b4732 100644 --- a/source/java/org/alfresco/rest/framework/webscripts/ResponseCallBack.java +++ b/source/java/org/alfresco/rest/framework/webscripts/WithResponse.java @@ -13,14 +13,14 @@ import java.util.Map; * * @author Gethin James */ -public class ResponseCallBack +public class WithResponse { private ContentInfo contentInfo; private int status; private Map headers; private Cache cache; - public ResponseCallBack(int status, ContentInfo contentInfo, Cache cache) + public WithResponse(int status, ContentInfo contentInfo, Cache cache) { this.contentInfo = contentInfo; this.status = status; diff --git a/source/test-java/org/alfresco/rest/framework/tests/api/mocks/MultiPartTestEntityResource.java b/source/test-java/org/alfresco/rest/framework/tests/api/mocks/MultiPartTestEntityResource.java index 095d7e5404..736b6dde4d 100644 --- a/source/test-java/org/alfresco/rest/framework/tests/api/mocks/MultiPartTestEntityResource.java +++ b/source/test-java/org/alfresco/rest/framework/tests/api/mocks/MultiPartTestEntityResource.java @@ -5,7 +5,7 @@ import org.alfresco.rest.framework.WebApiDescription; import org.alfresco.rest.framework.resource.EntityResource; import org.alfresco.rest.framework.resource.actions.interfaces.MultiPartResourceAction; import org.alfresco.rest.framework.resource.parameters.Parameters; -import org.alfresco.rest.framework.webscripts.ResponseCallBack; +import org.alfresco.rest.framework.webscripts.WithResponse; import org.springframework.extensions.webscripts.Status; import org.springframework.extensions.webscripts.servlet.FormData; @@ -19,7 +19,7 @@ public class MultiPartTestEntityResource @Override @WebApiDescription(title = "Creates a multipart", successStatus = Status.STATUS_ACCEPTED) - public MultiPartTestResponse create(FormData formData, Parameters parameters, ResponseCallBack withResponse) + public MultiPartTestResponse create(FormData formData, Parameters parameters, WithResponse withResponse) { return new MultiPartTestResponse(formData.getParameters().get("filename")[0]); } diff --git a/source/test-java/org/alfresco/rest/framework/tests/api/mocks/MultiPartTestRelationshipResource.java b/source/test-java/org/alfresco/rest/framework/tests/api/mocks/MultiPartTestRelationshipResource.java index 764fd3def6..6d16397075 100644 --- a/source/test-java/org/alfresco/rest/framework/tests/api/mocks/MultiPartTestRelationshipResource.java +++ b/source/test-java/org/alfresco/rest/framework/tests/api/mocks/MultiPartTestRelationshipResource.java @@ -4,7 +4,7 @@ package org.alfresco.rest.framework.tests.api.mocks; import org.alfresco.rest.framework.resource.RelationshipResource; import org.alfresco.rest.framework.resource.actions.interfaces.MultiPartRelationshipResourceAction; import org.alfresco.rest.framework.resource.parameters.Parameters; -import org.alfresco.rest.framework.webscripts.ResponseCallBack; +import org.alfresco.rest.framework.webscripts.WithResponse; import org.springframework.extensions.webscripts.servlet.FormData; /** @@ -17,7 +17,7 @@ public class MultiPartTestRelationshipResource @Override public MultiPartTestResponse create(String entityResourceId, FormData formData, - Parameters parameters, ResponseCallBack withResponse) + Parameters parameters, WithResponse withResponse) { return new MultiPartTestResponse(formData.getParameters().get("filename")[0]); } diff --git a/source/test-java/org/alfresco/rest/framework/tests/core/AbstractContextTest.java b/source/test-java/org/alfresco/rest/framework/tests/core/AbstractContextTest.java index d59e5603ed..f50ebd1840 100644 --- a/source/test-java/org/alfresco/rest/framework/tests/core/AbstractContextTest.java +++ b/source/test-java/org/alfresco/rest/framework/tests/core/AbstractContextTest.java @@ -16,7 +16,7 @@ import org.alfresco.rest.framework.resource.parameters.Params; import org.alfresco.rest.framework.webscripts.AbstractResourceWebScript; import org.alfresco.rest.framework.webscripts.ApiWebScript; import org.alfresco.rest.framework.webscripts.ResourceWebScriptHelper; -import org.alfresco.rest.framework.webscripts.ResponseCallBack; +import org.alfresco.rest.framework.webscripts.WithResponse; import org.alfresco.service.transaction.TransactionService; import org.junit.Before; import org.junit.runner.RunWith; @@ -52,7 +52,7 @@ public abstract class AbstractContextTest static Params NOT_USED = Params.valueOf("notUsed", null, mock(WebScriptRequest.class)); static final Params.RecognizedParams NULL_PARAMS = new Params.RecognizedParams(null, null, null, null, null, null, null, false); - static final ResponseCallBack callBack = new ResponseCallBack(Status.STATUS_OK, ApiWebScript.DEFAULT_JSON_CONTENT,ApiWebScript.CACHE_NEVER); + static final WithResponse callBack = new WithResponse(Status.STATUS_OK, ApiWebScript.DEFAULT_JSON_CONTENT,ApiWebScript.CACHE_NEVER); static Api api = Api.valueOf("alfrescomock", "private", "1"); @SuppressWarnings("unchecked")