From 3b65b30bd5723e2f55253309af03613d8512513d Mon Sep 17 00:00:00 2001 From: Damian Ujma <92095156+damianujma@users.noreply.github.com> Date: Thu, 17 Feb 2022 15:06:28 +0100 Subject: [PATCH] MNT-22780: fix rule behavior (#950) * MNT-22780 Remove properties if node has aspect * MNT-22780 Add remove features test * MNT-22780 Remove wildcard imports + fix test * MNT-22780 Remove aspect when only node has aspect * MNT-22780 Fix if statement --- .../repo/node/db/DbNodeServiceImpl.java | 246 +++++++++--------- .../RemoveFeaturesActionExecuterTest.java | 54 ++++ 2 files changed, 173 insertions(+), 127 deletions(-) diff --git a/repository/src/main/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java b/repository/src/main/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java index 974d87f4b0..cd6e33f032 100644 --- a/repository/src/main/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java +++ b/repository/src/main/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java @@ -1,106 +1,106 @@ -/* +/* * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of * the paid license agreement will prevail. Otherwise, the software is * provided under the following open source license terms: * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.repo.node.db; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Set; - -import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.model.ContentModel; -import org.alfresco.repo.domain.node.ChildAssocEntity; -import org.alfresco.repo.domain.node.Node; -import org.alfresco.repo.domain.node.NodeDAO; -import org.alfresco.repo.domain.node.NodeDAO.ChildAssocRefQueryCallback; -import org.alfresco.repo.domain.node.NodeExistsException; -import org.alfresco.repo.domain.qname.QNameDAO; -import org.alfresco.repo.node.AbstractNodeServiceImpl; -import org.alfresco.repo.node.StoreArchiveMap; -import org.alfresco.repo.node.archive.NodeArchiveService; -import org.alfresco.repo.node.db.NodeHierarchyWalker.VisitedNode; -import org.alfresco.repo.node.db.traitextender.NodeServiceExtension; -import org.alfresco.repo.node.db.traitextender.NodeServiceTrait; -import org.alfresco.repo.policy.BehaviourFilter; -import org.alfresco.repo.security.authentication.AuthenticationUtil; -import org.alfresco.repo.transaction.AlfrescoTransactionSupport; -import org.alfresco.repo.transaction.AlfrescoTransactionSupport.TxnReadState; -import org.alfresco.repo.transaction.RetryingTransactionHelper; -import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; -import org.alfresco.repo.transaction.TransactionalResourceHelper; -import org.alfresco.service.cmr.dictionary.AspectDefinition; -import org.alfresco.service.cmr.dictionary.AssociationDefinition; -import org.alfresco.service.cmr.dictionary.ChildAssociationDefinition; -import org.alfresco.service.cmr.dictionary.ClassDefinition; -import org.alfresco.service.cmr.dictionary.InvalidAspectException; -import org.alfresco.service.cmr.dictionary.InvalidTypeException; -import org.alfresco.service.cmr.dictionary.PropertyDefinition; -import org.alfresco.service.cmr.dictionary.TypeDefinition; -import org.alfresco.service.cmr.repository.AssociationExistsException; -import org.alfresco.service.cmr.repository.AssociationRef; -import org.alfresco.service.cmr.repository.ChildAssociationRef; -import org.alfresco.service.cmr.repository.InvalidChildAssociationRefException; -import org.alfresco.service.cmr.repository.InvalidNodeRefException; -import org.alfresco.service.cmr.repository.InvalidStoreRefException; -import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.service.cmr.repository.NodeRef.Status; -import org.alfresco.service.cmr.repository.NodeService; -import org.alfresco.service.cmr.repository.Path; -import org.alfresco.service.cmr.repository.StoreRef; -import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; -import org.alfresco.service.cmr.security.AccessPermission; -import org.alfresco.service.cmr.security.AccessStatus; -import org.alfresco.service.cmr.security.OwnableService; -import org.alfresco.service.cmr.security.PermissionService; -import org.alfresco.service.namespace.NamespaceService; -import org.alfresco.service.namespace.QName; -import org.alfresco.service.namespace.QNamePattern; -import org.alfresco.service.namespace.RegexQNamePattern; -import org.alfresco.traitextender.AJProxyTrait; -import org.alfresco.traitextender.Extend; -import org.alfresco.traitextender.ExtendedTrait; -import org.alfresco.traitextender.Extensible; -import org.alfresco.traitextender.Trait; -import org.alfresco.util.EqualsHelper; -import org.alfresco.util.GUID; -import org.alfresco.util.Pair; -import org.alfresco.util.ParameterCheck; -import org.alfresco.util.PropertyMap; -import org.alfresco.util.transaction.TransactionListenerAdapter; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; + +import org.alfresco.error.AlfrescoRuntimeException; +import org.alfresco.model.ContentModel; +import org.alfresco.repo.domain.node.ChildAssocEntity; +import org.alfresco.repo.domain.node.Node; +import org.alfresco.repo.domain.node.NodeDAO; +import org.alfresco.repo.domain.node.NodeDAO.ChildAssocRefQueryCallback; +import org.alfresco.repo.domain.node.NodeExistsException; +import org.alfresco.repo.domain.qname.QNameDAO; +import org.alfresco.repo.node.AbstractNodeServiceImpl; +import org.alfresco.repo.node.StoreArchiveMap; +import org.alfresco.repo.node.archive.NodeArchiveService; +import org.alfresco.repo.node.db.NodeHierarchyWalker.VisitedNode; +import org.alfresco.repo.node.db.traitextender.NodeServiceExtension; +import org.alfresco.repo.node.db.traitextender.NodeServiceTrait; +import org.alfresco.repo.policy.BehaviourFilter; +import org.alfresco.repo.security.authentication.AuthenticationUtil; +import org.alfresco.repo.transaction.AlfrescoTransactionSupport; +import org.alfresco.repo.transaction.AlfrescoTransactionSupport.TxnReadState; +import org.alfresco.repo.transaction.RetryingTransactionHelper; +import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; +import org.alfresco.repo.transaction.TransactionalResourceHelper; +import org.alfresco.service.cmr.dictionary.AspectDefinition; +import org.alfresco.service.cmr.dictionary.AssociationDefinition; +import org.alfresco.service.cmr.dictionary.ChildAssociationDefinition; +import org.alfresco.service.cmr.dictionary.ClassDefinition; +import org.alfresco.service.cmr.dictionary.InvalidAspectException; +import org.alfresco.service.cmr.dictionary.InvalidTypeException; +import org.alfresco.service.cmr.dictionary.PropertyDefinition; +import org.alfresco.service.cmr.dictionary.TypeDefinition; +import org.alfresco.service.cmr.repository.AssociationExistsException; +import org.alfresco.service.cmr.repository.AssociationRef; +import org.alfresco.service.cmr.repository.ChildAssociationRef; +import org.alfresco.service.cmr.repository.InvalidChildAssociationRefException; +import org.alfresco.service.cmr.repository.InvalidNodeRefException; +import org.alfresco.service.cmr.repository.InvalidStoreRefException; +import org.alfresco.service.cmr.repository.NodeRef; +import org.alfresco.service.cmr.repository.NodeRef.Status; +import org.alfresco.service.cmr.repository.NodeService; +import org.alfresco.service.cmr.repository.Path; +import org.alfresco.service.cmr.repository.StoreRef; +import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; +import org.alfresco.service.cmr.security.AccessPermission; +import org.alfresco.service.cmr.security.AccessStatus; +import org.alfresco.service.cmr.security.OwnableService; +import org.alfresco.service.cmr.security.PermissionService; +import org.alfresco.service.namespace.NamespaceService; +import org.alfresco.service.namespace.QName; +import org.alfresco.service.namespace.QNamePattern; +import org.alfresco.service.namespace.RegexQNamePattern; +import org.alfresco.traitextender.AJProxyTrait; +import org.alfresco.traitextender.Extend; +import org.alfresco.traitextender.ExtendedTrait; +import org.alfresco.traitextender.Extensible; +import org.alfresco.traitextender.Trait; +import org.alfresco.util.EqualsHelper; +import org.alfresco.util.GUID; +import org.alfresco.util.Pair; +import org.alfresco.util.ParameterCheck; +import org.alfresco.util.PropertyMap; +import org.alfresco.util.transaction.TransactionListenerAdapter; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.extensions.surf.util.I18NUtil; /** @@ -844,26 +844,25 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens // get the node final Pair nodePair = getNodePairNotNull(nodeRef); final Long nodeId = nodePair.getFirst(); - - boolean hadAspect = nodeDAO.hasNodeAspect(nodeId, aspectTypeQName); - + + if (!nodeDAO.hasNodeAspect(nodeId, aspectTypeQName)) + { + return; + } // Invoke policy behaviours invokeBeforeUpdateNode(nodeRef); - if (hadAspect) - { - invokeBeforeRemoveAspect(nodeRef, aspectTypeQName); - nodeDAO.removeNodeAspects(nodeId, Collections.singleton(aspectTypeQName)); - } - + invokeBeforeRemoveAspect(nodeRef, aspectTypeQName); + nodeDAO.removeNodeAspects(nodeId, Collections.singleton(aspectTypeQName)); + AspectDefinition aspectDef = dictionaryService.getAspect(aspectTypeQName); boolean updated = false; if (aspectDef != null) { // Remove default properties - Map propertyDefs = aspectDef.getProperties(); + Map propertyDefs = aspectDef.getProperties(); Set propertyToRemoveQNames = propertyDefs.keySet(); nodeDAO.removeNodeProperties(nodeId, propertyToRemoveQNames); - + // Remove child associations // We have to iterate over the associations and remove all those between the parent and child final List> assocsToDelete = new ArrayList>(5); @@ -875,29 +874,24 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens return true; } - @Override - public boolean orderResults() + @Override public boolean orderResults() { return false; } - public boolean handle( - Pair childAssocPair, - Pair parentNodePair, - Pair childNodePair - ) + public boolean handle(Pair childAssocPair, Pair parentNodePair, + Pair childNodePair) { if (isPendingDelete(parentNodePair.getSecond()) || isPendingDelete(childNodePair.getSecond())) { if (logger.isTraceEnabled()) { - logger.trace( - "Aspect-triggered association removal: " + - "Ignoring child associations where one of the nodes is pending delete: " + childAssocPair); + logger.trace("Aspect-triggered association removal: " + + "Ignoring child associations where one of the nodes is pending delete: " + childAssocPair); } return true; } - + // Double check that it's not a primary association. If so, we can't delete it and // have to delete the child node directly and with full archival. if (childAssocPair.getSecond().isPrimary()) @@ -914,7 +908,7 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens public void done() { - } + } }; // Get all the QNames to remove Set assocTypeQNamesToRemove = new HashSet(aspectDef.getChildAssociations().keySet()); @@ -930,14 +924,14 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens nodeDAO.deleteChildAssoc(assocId); invokeOnDeleteChildAssociation(assocRef); } - + // Cascade-delete any nodes that were attached to primary associations for (Pair childNodePair : nodesToDelete) { NodeRef childNodeRef = childNodePair.getSecond(); this.deleteNode(childNodeRef); } - + // Gather peer associations to delete Map nodeAssocDefs = aspectDef.getAssociations(); List nodeAssocIdsToRemove = new ArrayList(13); @@ -949,8 +943,8 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens if (logger.isTraceEnabled()) { logger.trace( - "Aspect-triggered association removal: " + - "Ignoring peer associations where one of the nodes is pending delete: " + nodeRef); + "Aspect-triggered association removal: " + "Ignoring peer associations where one of the nodes is pending delete: " + + nodeRef); } continue; } @@ -967,9 +961,8 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens { if (logger.isTraceEnabled()) { - logger.trace( - "Aspect-triggered association removal: " + - "Ignoring peer associations where one of the nodes is pending delete: " + assocPair); + logger.trace("Aspect-triggered association removal: " + + "Ignoring peer associations where one of the nodes is pending delete: " + assocPair); } continue; } @@ -990,16 +983,15 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens } updated = updated || assocsDeleted > 0; } - + // Invoke policy behaviours if (updated) { invokeOnUpdateNode(nodeRef); } - if (hadAspect) - { - invokeOnRemoveAspect(nodeRef, aspectTypeQName); - } + + invokeOnRemoveAspect(nodeRef, aspectTypeQName); + } /** diff --git a/repository/src/test/java/org/alfresco/repo/action/executer/RemoveFeaturesActionExecuterTest.java b/repository/src/test/java/org/alfresco/repo/action/executer/RemoveFeaturesActionExecuterTest.java index ac88fb6f26..0a67b8ce80 100644 --- a/repository/src/test/java/org/alfresco/repo/action/executer/RemoveFeaturesActionExecuterTest.java +++ b/repository/src/test/java/org/alfresco/repo/action/executer/RemoveFeaturesActionExecuterTest.java @@ -31,10 +31,12 @@ import org.alfresco.repo.security.authentication.AuthenticationComponent; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.StoreRef; +import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.test_category.BaseSpringTestsCategory; import org.alfresco.util.BaseSpringTest; import org.alfresco.util.GUID; +import org.alfresco.util.PropertyMap; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -130,4 +132,56 @@ public class RemoveFeaturesActionExecuterTest extends BaseSpringTest action2.setParameterValue(RemoveFeaturesActionExecuter.PARAM_ASPECT_NAME, ContentModel.ASPECT_VERSIONABLE); this.executer.execute(action2, this.nodeRef); } + + /** + * Test removing aspect properties + */ + @Test + public void testRemovingAspectPropertiesAfterExecution() + { + QName QNAME_PUBLISHER = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "publisher"); + QName QNAME_SUBJECT = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "subject"); + + // Execute the action + PropertyMap dublinCoreProperties = new PropertyMap(2); + dublinCoreProperties.put(QNAME_PUBLISHER, "publisher"); + dublinCoreProperties.put(QNAME_SUBJECT, "subject"); + nodeService.addAspect(nodeRef, ContentModel.ASPECT_DUBLINCORE, dublinCoreProperties); + + // Check that the node has aspect properties + assertTrue(this.nodeService.hasAspect(this.nodeRef, ContentModel.ASPECT_DUBLINCORE)); + assertTrue(this.nodeService.getProperties(this.nodeRef).containsKey(QNAME_PUBLISHER)); + assertTrue(this.nodeService.getProperties(this.nodeRef).containsKey(QNAME_SUBJECT)); + + // Remove the aspect + ActionImpl action = new ActionImpl(null, ID, RemoveFeaturesActionExecuter.NAME, null); + action.setParameterValue(RemoveFeaturesActionExecuter.PARAM_ASPECT_NAME, ContentModel.ASPECT_DUBLINCORE); + this.executer.execute(action, this.nodeRef); + + // Check that the node now no longer has aspect properties + assertFalse(this.nodeService.getProperties(this.nodeRef).containsKey(QNAME_PUBLISHER)); + assertFalse(this.nodeService.getProperties(this.nodeRef).containsKey(QNAME_SUBJECT)); + } + + /** + * Test removing not added child aspect + */ + @Test + public void testRemovingNotAddedChildAspect() + { + QName QNAME_TITLE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "title"); + + // Execute the action + PropertyMap titledProperties = new PropertyMap(1); + titledProperties.put(QNAME_TITLE, "title"); + nodeService.addAspect(nodeRef, ContentModel.ASPECT_TITLED, titledProperties); + + // Remove the child aspect which has not been added to the node + ActionImpl action = new ActionImpl(null, ID, RemoveFeaturesActionExecuter.NAME, null); + action.setParameterValue(RemoveFeaturesActionExecuter.PARAM_ASPECT_NAME, ContentModel.ASPECT_DUBLINCORE); + this.executer.execute(action, this.nodeRef); + + // Now check that the node has parent aspect properties + assertTrue(this.nodeService.getProperties(this.nodeRef).containsKey(QNAME_TITLE)); + } }