mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
RM-6852 Fix inconsistencies in V1 response codes
This commit is contained in:
@@ -164,6 +164,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
|
|||||||
private static final String FINAL_DESCRIPTION = "rm.service.final-version-description";
|
private static final String FINAL_DESCRIPTION = "rm.service.final-version-description";
|
||||||
private static final String MSG_UNDECLARED_ONLY_RECORDS = "rm.action.undeclared-only-records";
|
private static final String MSG_UNDECLARED_ONLY_RECORDS = "rm.action.undeclared-only-records";
|
||||||
private static final String MSG_NO_DECLARE_MAND_PROP = "rm.action.no-declare-mand-prop";
|
private static final String MSG_NO_DECLARE_MAND_PROP = "rm.action.no-declare-mand-prop";
|
||||||
|
private static final String MSG_CANNOT_CREATE_CHILDREN_IN_CLOSED_RECORD_FOLDER = "rm.service.add-children-to-closed-record-folder";
|
||||||
|
|
||||||
/** Always edit property array */
|
/** Always edit property array */
|
||||||
private static final QName[] ALWAYS_EDIT_PROPERTIES = new QName[]
|
private static final QName[] ALWAYS_EDIT_PROPERTIES = new QName[]
|
||||||
@@ -1058,7 +1059,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
|
|||||||
Boolean isClosed = (Boolean) nodeService.getProperty(newRecordContainer, PROP_IS_CLOSED);
|
Boolean isClosed = (Boolean) nodeService.getProperty(newRecordContainer, PROP_IS_CLOSED);
|
||||||
if (isClosed != null && isClosed)
|
if (isClosed != null && isClosed)
|
||||||
{
|
{
|
||||||
throw new AlfrescoRuntimeException("Unable to create record, because container is closed.");
|
throw new IntegrityException(I18NUtil.getMessage(MSG_CANNOT_CREATE_CHILDREN_IN_CLOSED_RECORD_FOLDER), null);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (extendedPermissionService.hasPermission(newRecordContainer, RMPermissionModel.FILING) == AccessStatus.DENIED)
|
if (extendedPermissionService.hasPermission(newRecordContainer, RMPermissionModel.FILING) == AccessStatus.DENIED)
|
||||||
|
@@ -50,6 +50,7 @@ import org.alfresco.model.ContentModel;
|
|||||||
import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
|
import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
|
||||||
import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule;
|
import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule;
|
||||||
import org.alfresco.module.org_alfresco_module_rm.test.util.BaseUnitTest;
|
import org.alfresco.module.org_alfresco_module_rm.test.util.BaseUnitTest;
|
||||||
|
import org.alfresco.repo.node.integrity.IntegrityException;
|
||||||
import org.alfresco.repo.policy.Behaviour;
|
import org.alfresco.repo.policy.Behaviour;
|
||||||
import org.alfresco.repo.security.permissions.AccessDeniedException;
|
import org.alfresco.repo.security.permissions.AccessDeniedException;
|
||||||
import org.alfresco.service.cmr.repository.ChildAssociationRef;
|
import org.alfresco.service.cmr.repository.ChildAssociationRef;
|
||||||
@@ -77,6 +78,7 @@ public class RecordServiceImplUnitTest extends BaseUnitTest
|
|||||||
private NodeRef dmNodeRef;
|
private NodeRef dmNodeRef;
|
||||||
private NodeRef unfiledRecordContainer;
|
private NodeRef unfiledRecordContainer;
|
||||||
private NodeRef frozenRecordFolder;
|
private NodeRef frozenRecordFolder;
|
||||||
|
private NodeRef closedRecordFolder;
|
||||||
private ChildAssociationRef parentAssoc;
|
private ChildAssociationRef parentAssoc;
|
||||||
|
|
||||||
private static QName TYPE_MY_FILE_PLAN = generateQName();
|
private static QName TYPE_MY_FILE_PLAN = generateQName();
|
||||||
@@ -96,6 +98,7 @@ public class RecordServiceImplUnitTest extends BaseUnitTest
|
|||||||
dmNodeRef = generateNodeRef(TYPE_CONTENT);
|
dmNodeRef = generateNodeRef(TYPE_CONTENT);
|
||||||
unfiledRecordContainer = generateNodeRef(TYPE_UNFILED_RECORD_CONTAINER);
|
unfiledRecordContainer = generateNodeRef(TYPE_UNFILED_RECORD_CONTAINER);
|
||||||
frozenRecordFolder = generateNodeRef(TYPE_RECORD_FOLDER);
|
frozenRecordFolder = generateNodeRef(TYPE_RECORD_FOLDER);
|
||||||
|
closedRecordFolder = generateNodeRef(TYPE_RECORD_FOLDER);
|
||||||
parentAssoc = mock(ChildAssociationRef.class);
|
parentAssoc = mock(ChildAssociationRef.class);
|
||||||
|
|
||||||
// set-up node service
|
// set-up node service
|
||||||
@@ -599,6 +602,20 @@ public class RecordServiceImplUnitTest extends BaseUnitTest
|
|||||||
recordService.createRecord(filePlan, dmNodeRef, frozenRecordFolder);
|
recordService.createRecord(filePlan, dmNodeRef, frozenRecordFolder);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Given a file that is not yet a record
|
||||||
|
* When I create the record specifying a closed destination record folder
|
||||||
|
* Then an exception is thrown
|
||||||
|
*/
|
||||||
|
@Test(expected= IntegrityException.class)
|
||||||
|
public void createRecordIntoClosedRecordFolder()
|
||||||
|
{
|
||||||
|
mocksForRecordCreation();
|
||||||
|
|
||||||
|
// create the record
|
||||||
|
recordService.createRecord(filePlan, dmNodeRef, closedRecordFolder);
|
||||||
|
}
|
||||||
|
|
||||||
/* Helper method to set up the mocks for record creation */
|
/* Helper method to set up the mocks for record creation */
|
||||||
private void mocksForRecordCreation()
|
private void mocksForRecordCreation()
|
||||||
{
|
{
|
||||||
@@ -612,6 +629,7 @@ public class RecordServiceImplUnitTest extends BaseUnitTest
|
|||||||
when(mockedFilePlanService.isFilePlan(nonStandardFilePlan)).thenReturn(true);
|
when(mockedFilePlanService.isFilePlan(nonStandardFilePlan)).thenReturn(true);
|
||||||
when(mockedFreezeService.isFrozen(recordFolder)).thenReturn(false);
|
when(mockedFreezeService.isFrozen(recordFolder)).thenReturn(false);
|
||||||
when(mockedFreezeService.isFrozen(frozenRecordFolder)).thenReturn(true);
|
when(mockedFreezeService.isFrozen(frozenRecordFolder)).thenReturn(true);
|
||||||
|
when(mockedNodeService.getProperty(closedRecordFolder, PROP_IS_CLOSED)).thenReturn(true);
|
||||||
|
|
||||||
// mocks for policies
|
// mocks for policies
|
||||||
doNothing().when(recordService).invokeBeforeRecordDeclaration(dmNodeRef);
|
doNothing().when(recordService).invokeBeforeRecordDeclaration(dmNodeRef);
|
||||||
|
Reference in New Issue
Block a user