From aa83ccaab856ce0d1d86908889fc4b2f67a7dd19 Mon Sep 17 00:00:00 2001
From: Ross Gale <ross.gale@alfresco.com>
Date: Thu, 11 Jul 2019 15:41:14 +0100
Subject: [PATCH 1/2] MNT-20741 adding code to check for subtypes

---
 .../org_alfresco_module_rm/module-context.xml   |  3 +--
 .../util/ContentBinDuplicationUtility.java      | 17 +----------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module-context.xml
index 84b6bb8ba6..47f8482705 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module-context.xml
@@ -248,9 +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"/>
    </bean>
 
    <!--  Prevent ghosted records being renditioned -->
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/ContentBinDuplicationUtility.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/ContentBinDuplicationUtility.java
index c1d7e879f0..42fc419881 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/ContentBinDuplicationUtility.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/ContentBinDuplicationUtility.java
@@ -29,7 +29,6 @@ package org.alfresco.module.org_alfresco_module_rm.util;
 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;
 
@@ -38,7 +37,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
  * @author Ross Gale
  * @since 2.7.2
  */
-public class ContentBinDuplicationUtility
+public class ContentBinDuplicationUtility extends ServiceBaseImpl
 {
 
     /**
@@ -46,11 +45,6 @@ public class ContentBinDuplicationUtility
      */
     private BehaviourFilter behaviourFilter;
 
-    /**
-     * Provides methods for accessing and transforming content.
-     */
-    private ContentService contentService;
-
     /**
      * Setter for behaviour filter
      * @param behaviourFilter BehaviourFilter
@@ -60,15 +54,6 @@ public class ContentBinDuplicationUtility
         this.behaviourFilter = behaviourFilter;
     }
 
-    /**
-     * Setter for content service
-     * @param contentService ContentService
-     */
-    public void setContentService(ContentService contentService)
-    {
-        this.contentService = contentService;
-    }
-
     /**
      * Duplicate the content of a node without triggering the audit or versioning behaviours
      *

From 412a313702463c04e6bacb0f8e10b0e848d7e2d8 Mon Sep 17 00:00:00 2001
From: Ross Gale <ross.gale@alfresco.com>
Date: Fri, 3 May 2019 16:57:12 +0300
Subject: [PATCH 2/2] Removing severe sonar warnings

(cherry picked from commit 343602e94d851cbe7529557ac78a217b257a8ac0)

(cherry picked from commit b66cce35e3bf33073d7ab3fd4007b893c0ae16dc)
---
 .../model/rma/aspect/FilePlanComponentAspect.java    | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java
index e23c242cbe..bfa1816bdd 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java
+++ b/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;
@@ -83,9 +82,6 @@ public class FilePlanComponentAspect extends    BaseBehaviourBean
     /** file plan service */
     private FilePlanService filePlanService;
 
-    /** rendition service */
-    private RenditionService renditionService;
-
     /**
      * @param scriptService set script service
      */
@@ -110,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)
      */