Merge MNT-20741 fix from release/V3.0 branch to release/V3.1 branch

rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module-context.xml

@@ -248,10 +248,8 @@
       </property>
    </bean>
 
-   <bean name="contentBinDuplicationUtility" class="org.alfresco.module.org_alfresco_module_rm.util.ContentBinDuplicationUtility">
+   <bean name="contentBinDuplicationUtility" class="org.alfresco.module.org_alfresco_module_rm.util.ContentBinDuplicationUtility" parent="baseService">
       <property name="behaviourFilter" ref="policyBehaviourFilter"/>
-      <property name="contentService" ref="contentService"/>
-      <property name="nodeService" ref="nodeService"/>
    </bean>
 
    <!--  Prevent ghosted records being renditioned -->

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java

@@ -46,7 +46,6 @@ import org.alfresco.repo.policy.annotation.BehaviourBean;
 import org.alfresco.repo.policy.annotation.BehaviourKind;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
-import org.alfresco.service.cmr.rendition.RenditionService;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.ScriptService;
@@ -107,14 +106,6 @@ public class FilePlanComponentAspect extends    BaseBehaviourBean
         this.filePlanService = filePlanService;
     }
 
-    /**
-     * @param service   rendition service
-     */
-    public void setRenditionService(RenditionService service)
-    {
-        this.renditionService = service;
-    }
-
     /**
      * @see org.alfresco.repo.node.NodeServicePolicies.OnUpdatePropertiesPolicy#onUpdateProperties(org.alfresco.service.cmr.repository.NodeRef, java.util.Map, java.util.Map)
      */

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/ContentBinDuplicationUtility.java

@@ -26,38 +26,24 @@
  */
 package org.alfresco.module.org_alfresco_module_rm.util;
 
-import static org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel.ASPECT_ARCHIVED;
-
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.policy.BehaviourFilter;
 import org.alfresco.service.cmr.repository.ContentReader;
-import org.alfresco.service.cmr.repository.ContentService;
 import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.repository.NodeService;
 
 /**
  * Utility class to duplicate the content of a node without triggering the audit or versioning behaviours
  * @author Ross Gale
  * @since 2.7.2
  */
-public class ContentBinDuplicationUtility
+public class ContentBinDuplicationUtility extends ServiceBaseImpl
 {
     /**
      * Behaviour filter
      */
     private BehaviourFilter behaviourFilter;
 
-    /**
-     * Provides methods for accessing and transforming content.
-     */
-    private ContentService contentService;
-
-    /**
-     * Node service
-     */
-    private NodeService nodeService;
-
     /**
      * Setter for behaviour filter
      * @param behaviourFilter BehaviourFilter
@@ -67,34 +53,6 @@ public class ContentBinDuplicationUtility
         this.behaviourFilter = behaviourFilter;
     }
 
-    /**
-     * Setter for content service
-     * @param contentService ContentService
-     */
-    public void setContentService(ContentService contentService)
-    {
-        this.contentService = contentService;
-    }
-
-    /**
-     * Setter for node service
-     *
-     * @param nodeService NodeService
-     */
-    public void setNodeService(NodeService nodeService)
-    {
-        this.nodeService = nodeService;
-    }
-
-    /**
-     * Getter for node service
-     *
-     * @return  nodeService
-     */
-    public NodeService getNodeService()
-    {
-        return nodeService;
-    }
     /**
      * Duplicate the content of a node without triggering the audit or versioning behaviours
      *