From 7b87cf446e64aee53f79bb8da8801f121c1b0cb9 Mon Sep 17 00:00:00 2001
From: Neil McErlean <neil.mcerlean@alfresco.com>
Date: Tue, 25 Aug 2015 16:12:45 +0000
Subject: [PATCH] Fix for RM-2549. The copyAspect implementation needs to be
 very careful to use addProperties not setPropertiesand it also needs to not
 copy inherited properties.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@110844 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../util/CoreServicesExtras.java                   | 14 ++++++++------
 .../util/CoreServicesExtrasUnitTest.java           |  8 ++++++++
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/CoreServicesExtras.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/CoreServicesExtras.java
index bba48d78eb..924e2089c7 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/CoreServicesExtras.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/CoreServicesExtras.java
@@ -23,6 +23,7 @@ import static org.alfresco.util.collections.CollectionUtils.filterKeys;
 import org.alfresco.service.cmr.dictionary.AspectDefinition;
 import org.alfresco.service.cmr.dictionary.DictionaryException;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.namespace.QName;
@@ -30,7 +31,6 @@ import org.alfresco.util.collections.Function;
 
 import java.io.Serializable;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * Provides additional methods of general use that could (in principle) be moved to the core services.
@@ -55,29 +55,31 @@ public class CoreServicesExtras
 
     /**
      * This method copies the property values for the specified aspect from one node to another.
-     * All associations are ignored.
+     * All associations are ignored. Inherited properties are not copied.
      *
      * @param from the node whose property values are to be read.
      * @param to   the node to which the property values are to be written.
      * @return a Map of the property values which were copied.
      */
-    public Map<QName, Serializable> copyAspect(NodeRef from, NodeRef to, QName aspectQName)
+    public Map<QName, Serializable> copyAspect(final NodeRef from, final NodeRef to, final QName aspectQName)
     {
         final AspectDefinition aspectDefn = dictionaryService.getAspect(aspectQName);
 
         if (aspectDefn == null) { throw new DictionaryException("Unknown aspect: " + aspectQName); }
 
-        final Set<QName> aspectProperties = aspectDefn.getProperties().keySet();
+        final Map<QName, PropertyDefinition> aspectProperties = aspectDefn.getProperties();
 
         final Map<QName, Serializable> nodeProperties = nodeService.getProperties(from);
         final Map<QName, Serializable> relevantPropVals = filterKeys(nodeProperties, new Function<QName, Boolean>()
         {
             @Override public Boolean apply(QName value)
             {
-                return aspectProperties.contains(value);
+                // Only copy property values that are defined on the provided aspect.
+                final PropertyDefinition propDef = aspectProperties.get(value);
+                return propDef != null && propDef.getContainerClass().getName().equals(aspectQName);
             }
         });
-        nodeService.setProperties(to, relevantPropVals);
+        nodeService.addProperties(to, relevantPropVals);
         return relevantPropVals;
     }
 }
diff --git a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/util/CoreServicesExtrasUnitTest.java b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/util/CoreServicesExtrasUnitTest.java
index d8551a3494..28d1afa9c4 100644
--- a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/util/CoreServicesExtrasUnitTest.java
+++ b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/util/CoreServicesExtrasUnitTest.java
@@ -27,6 +27,8 @@ import static org.mockito.Mockito.mock;
 import static org.alfresco.module.org_alfresco_module_rm.test.util.ExceptionUtils.expectedException;
 import static org.junit.Assert.assertEquals;
 
+import static java.util.Arrays.asList;
+
 import org.alfresco.service.cmr.dictionary.AspectDefinition;
 import org.alfresco.service.cmr.dictionary.DictionaryException;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
@@ -97,9 +99,15 @@ public class CoreServicesExtrasUnitTest
         final NodeService       mockNS = mock(NodeService.class);
 
         final AspectDefinition mockAspect = mock(AspectDefinition.class);
+        when(mockAspect.getName()).thenReturn(testAspect);
+
         final Map<QName, PropertyDefinition> props = new HashMap<>();
         final PropertyDefinition mockProp1 = mock(PropertyDefinition.class);
         final PropertyDefinition mockProp2 = mock(PropertyDefinition.class);
+        for (PropertyDefinition p : asList(mockProp1, mockProp2))
+        {
+            when(p.getContainerClass()).thenReturn(mockAspect);
+        }
         props.put(testProp1, mockProp1);
         props.put(testProp2, mockProp2);
         when(mockAspect.getProperties()).thenReturn(props);