inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1399 from Alfresco/feature/RM-6882_RemoveDodAspectFromRejectedRecord

Browse Source 
RM-6882 remove other rm specific aspects when rejecting a record
This commit is contained in:
Claudia Agache
2021-04-07 15:48:19 +03:00
committed by GitHub
parent 9c93ade0b7 48867f24ef
commit 772a3fb94b
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
View File

@@ -27,8 +27,12 @@
package org.alfresco.module.org_alfresco_module_rm.record; package org.alfresco.module.org_alfresco_module_rm.record;
import static java.util.Arrays.asList;
import static org.alfresco.module.org_alfresco_module_rm.dod5015.DOD5015Model.DOD_URI;
import static org.alfresco.module.org_alfresco_module_rm.record.RecordUtils.appendIdentifierToName; import static org.alfresco.module.org_alfresco_module_rm.record.RecordUtils.appendIdentifierToName;
import static org.alfresco.module.org_alfresco_module_rm.record.RecordUtils.generateRecordIdentifier; import static org.alfresco.module.org_alfresco_module_rm.record.RecordUtils.generateRecordIdentifier;
import static org.alfresco.module.org_alfresco_module_rm.version.RecordableVersionModel.RMV_URI;
import static org.alfresco.repo.policy.Behaviour.NotificationFrequency.FIRST_EVENT; import static org.alfresco.repo.policy.Behaviour.NotificationFrequency.FIRST_EVENT;
import static org.alfresco.repo.policy.Behaviour.NotificationFrequency.TRANSACTION_COMMIT; import static org.alfresco.repo.policy.Behaviour.NotificationFrequency.TRANSACTION_COMMIT;
import static org.alfresco.repo.policy.annotation.BehaviourKind.ASSOCIATION; import static org.alfresco.repo.policy.annotation.BehaviourKind.ASSOCIATION;
@@ -1370,7 +1374,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
authenticationUtil.runAsSystem(new RunAsWork<Void>() authenticationUtil.runAsSystem(new RunAsWork<Void>()
{ {
@Override @Override
public Void doWork() throws Exception public Void doWork() throws Exception
{ {
nodeService.addAspect(document, RecordsManagementModel.ASPECT_RECORD, null); nodeService.addAspect(document, RecordsManagementModel.ASPECT_RECORD, null);
@@ -1566,10 +1570,10 @@ public class RecordServiceImpl extends BaseBehaviourBean
// Note that when folder records are supported, we will need to recursively // Note that when folder records are supported, we will need to recursively
// remove aspects from their descendants. // remove aspects from their descendants.
final Set<QName> aspects = nodeService.getAspects(nodeRef); final Set<QName> aspects = nodeService.getAspects(nodeRef);
final List<String> rmURIs = asList(RM_URI, DOD_URI, RM_CUSTOM_URI, RMV_URI);
for (QName aspect : aspects) for (QName aspect : aspects)
{ {
if (RM_URI.equals(aspect.getNamespaceURI()) || if (rmURIs.contains(aspect.getNamespaceURI()))
RecordableVersionModel.RMV_URI.equals(aspect.getNamespaceURI()))
{ {
nodeService.removeAspect(nodeRef, aspect); nodeService.removeAspect(nodeRef, aspect);
} }
@@ -2020,14 +2024,14 @@ public class RecordServiceImpl extends BaseBehaviourBean
/** /**
* RM-5244 - workaround to make sure the incomplete aspect is removed * RM-5244 - workaround to make sure the incomplete aspect is removed
* *
* @param nodeRef the node to reevaluate for * @param nodeRef the node to reevaluate for
*/ */
private void reevaluateIncompleteTag(NodeRef nodeRef) private void reevaluateIncompleteTag(NodeRef nodeRef)
{ {
/* /*
* Check if the node has the aspect because the reevaluation is expensive. * Check if the node has the aspect because the reevaluation is expensive.
* If the node doesn't have the aspect it means IncompleteNodeTagger didn't load before TransactionBehaviourQueue * If the node doesn't have the aspect it means IncompleteNodeTagger didn't load before TransactionBehaviourQueue
* and we don't need to reevaluate. * and we don't need to reevaluate.
*/ */
if(nodeService.hasAspect(nodeRef, ContentModel.ASPECT_INCOMPLETE)) if(nodeService.hasAspect(nodeRef, ContentModel.ASPECT_INCOMPLETE))
@@ -2083,13 +2087,13 @@ public class RecordServiceImpl extends BaseBehaviourBean
LOGGER.warn(I18NUtil.getMessage(MSG_UNDECLARED_ONLY_RECORDS, nodeRef.toString())); LOGGER.warn(I18NUtil.getMessage(MSG_UNDECLARED_ONLY_RECORDS, nodeRef.toString()));
throw new IntegrityException("The record does not exist.", null); throw new IntegrityException("The record does not exist.", null);
} }
if (!isRecord(nodeRef)) if (!isRecord(nodeRef))
{ {
LOGGER.warn(I18NUtil.getMessage(MSG_UNDECLARED_ONLY_RECORDS, nodeRef.toString())); LOGGER.warn(I18NUtil.getMessage(MSG_UNDECLARED_ONLY_RECORDS, nodeRef.toString()));
throw new IntegrityException("The node is not a record.", null); throw new IntegrityException("The node is not a record.", null);
} }
if (freezeService.isFrozen(nodeRef)) if (freezeService.isFrozen(nodeRef))
{ {
LOGGER.warn(I18NUtil.getMessage(MSG_UNDECLARED_ONLY_RECORDS, nodeRef.toString())); LOGGER.warn(I18NUtil.getMessage(MSG_UNDECLARED_ONLY_RECORDS, nodeRef.toString()));
@@ -2142,7 +2146,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
} }
/** /**
* Helper method to build single string containing list of missing properties * Helper method to build single string containing list of missing properties
* *
* @param missingProperties list of missing properties * @param missingProperties list of missing properties
* @return String of missing properties * @return String of missing properties