From f360cb47a530d807f3d310bc950be89649bb97bf Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Mon, 15 May 2017 22:05:44 +0100 Subject: [PATCH] Reverted changes for RM-4528 --- .../api/fileplans/FilePlanChildrenRelation.java | 16 +++------------- .../RecordCategoryChildrenRelation.java | 13 +------------ 2 files changed, 4 insertions(+), 25 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/fileplans/FilePlanChildrenRelation.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/fileplans/FilePlanChildrenRelation.java index 7051160d40..923b70c636 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/fileplans/FilePlanChildrenRelation.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/fileplans/FilePlanChildrenRelation.java @@ -39,23 +39,22 @@ import java.util.Map; import java.util.Set; import org.alfresco.query.PagingResults; +import org.alfresco.repo.activities.ActivityType; import org.alfresco.repo.node.getchildren.FilterProp; -import org.alfresco.repo.node.integrity.IntegrityException; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.rest.api.impl.Util; import org.alfresco.rest.api.model.UserInfo; import org.alfresco.rest.framework.WebApiDescription; import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException; import org.alfresco.rest.framework.resource.RelationshipResource; -import org.alfresco.rest.framework.resource.actions.interfaces.MultiPartRelationshipResourceAction; 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.WithResponse; import org.alfresco.rm.rest.api.impl.ApiNodesModelFactory; import org.alfresco.rm.rest.api.impl.FilePlanComponentsApiUtils; import org.alfresco.rm.rest.api.impl.SearchTypesFactory; import org.alfresco.rm.rest.api.model.FilePlan; +import org.alfresco.rm.rest.api.model.Record; import org.alfresco.rm.rest.api.model.RecordCategory; import org.alfresco.service.cmr.model.FileFolderService; import org.alfresco.service.cmr.model.FileInfo; @@ -64,7 +63,6 @@ import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; import org.alfresco.util.ParameterCheck; import org.springframework.beans.factory.InitializingBean; -import org.springframework.extensions.webscripts.servlet.FormData; /** * File plan children relation @@ -74,9 +72,7 @@ import org.springframework.extensions.webscripts.servlet.FormData; */ @RelationshipResource(name="categories", entityResource = FilePlanEntityResource.class, title = "Category children of file plan") public class FilePlanChildrenRelation implements RelationshipResourceAction.Read, - RelationshipResourceAction.Create, - MultiPartRelationshipResourceAction.Create, - InitializingBean + RelationshipResourceAction.Create, InitializingBean { /** Record category type */ public static final String RECORD_CATEGORY_TYPE = "rma:recordCategory"; @@ -222,10 +218,4 @@ public class FilePlanChildrenRelation implements RelationshipResourceAction.Read return result; } - - @Override - public FilePlan create(String entityResourceId, FormData formData, Parameters parameters, WithResponse withResponse) - { - throw new IntegrityException("Uploading records into file plan root is not allowed.", null); - } } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/recordcategories/RecordCategoryChildrenRelation.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/recordcategories/RecordCategoryChildrenRelation.java index e9fa2147f0..e1bdb8a680 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/recordcategories/RecordCategoryChildrenRelation.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/recordcategories/RecordCategoryChildrenRelation.java @@ -45,18 +45,15 @@ import org.alfresco.model.ContentModel; import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel; import org.alfresco.query.PagingResults; import org.alfresco.repo.node.getchildren.FilterProp; -import org.alfresco.repo.node.integrity.IntegrityException; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.rest.api.Nodes; import org.alfresco.rest.api.impl.Util; import org.alfresco.rest.api.model.UserInfo; import org.alfresco.rest.framework.WebApiDescription; import org.alfresco.rest.framework.resource.RelationshipResource; -import org.alfresco.rest.framework.resource.actions.interfaces.MultiPartRelationshipResourceAction; 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.WithResponse; import org.alfresco.rm.rest.api.impl.ApiNodesModelFactory; import org.alfresco.rm.rest.api.impl.FilePlanComponentsApiUtils; import org.alfresco.rm.rest.api.impl.SearchTypesFactory; @@ -69,7 +66,6 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; import org.apache.commons.lang3.StringUtils; -import org.springframework.extensions.webscripts.servlet.FormData; /** * Record category children relation @@ -80,8 +76,7 @@ import org.springframework.extensions.webscripts.servlet.FormData; */ @RelationshipResource(name="children", entityResource = RecordCategoriesEntityResource.class, title = "Children of a record category") public class RecordCategoryChildrenRelation implements RelationshipResourceAction.Read, - RelationshipResourceAction.Create, - MultiPartRelationshipResourceAction.Create + RelationshipResourceAction.Create { private final static Set LIST_RECORD_CATEGORY_CHILDREN_EQUALS_QUERY_PROPERTIES = new HashSet<>(Arrays .asList(new String[] { RecordCategoryChild.PARAM_IS_RECORD_CATEGORY, RecordCategoryChild.PARAM_IS_RECORD_FOLDER, @@ -213,10 +208,4 @@ public class RecordCategoryChildrenRelation implements RelationshipResourceActio return result; } - - @Override - public RecordCategoryChild create(String entityResourceId, FormData formData, Parameters parameters, WithResponse withResponse) - { - throw new IntegrityException("Uploading records into record categories is not allowed.", null); - } }