From a64f4db52826744a048f6c5d291cea9f0c4fd79d Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Thu, 21 Aug 2014 08:02:07 +0000
Subject: [PATCH] RM-1623 (Move In-Place Record)  * InplaceRecordService now
 extends the BaseServiceImpl  * Using helper methods from the base class
 instead of using methods from AuthenticationUtils being able to use Mockito

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@80917 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../rm-service-context.xml                    |  7 +++----
 .../record/InplaceRecordServiceImpl.java      | 21 ++++---------------
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
index f41285327e..09c21d73e6 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
@@ -1107,14 +1107,13 @@
     </bean>
 
    <!--  Inplace Record Service -->
-   
-   <bean id="inplaceRecordService" class="org.alfresco.module.org_alfresco_module_rm.record.InplaceRecordServiceImpl">
+
+   <bean id="inplaceRecordService" parent="baseService" class="org.alfresco.module.org_alfresco_module_rm.record.InplaceRecordServiceImpl">
       <property name="siteService" ref="SiteService" />
-      <property name="nodeService" ref="NodeService" />
       <property name="extendedSecurityService" ref="ExtendedSecurityService" />
       <property name="fileFolderService" ref="FileFolderService" />
     </bean>
-    
+
    <bean id="InplaceRecordService" class="org.springframework.aop.framework.ProxyFactoryBean">
       <property name="proxyInterfaces">
          <value>org.alfresco.module.org_alfresco_module_rm.record.InplaceRecordService</value>
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/InplaceRecordServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/InplaceRecordServiceImpl.java
index 045f4e40ac..ea4c44036a 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/InplaceRecordServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/InplaceRecordServiceImpl.java
@@ -23,14 +23,13 @@ import java.util.List;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
 import org.alfresco.module.org_alfresco_module_rm.security.ExtendedSecurityService;
-import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.module.org_alfresco_module_rm.util.ServiceBaseImpl;
 import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
 import org.alfresco.service.cmr.model.FileExistsException;
 import org.alfresco.service.cmr.model.FileFolderService;
 import org.alfresco.service.cmr.model.FileNotFoundException;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.site.SiteInfo;
 import org.alfresco.service.cmr.site.SiteService;
 import org.alfresco.util.ParameterCheck;
@@ -41,14 +40,11 @@ import org.alfresco.util.ParameterCheck;
  * @author Tuna Aksoy
  * @since 2.3
  */
-public class InplaceRecordServiceImpl implements InplaceRecordService, RecordsManagementModel
+public class InplaceRecordServiceImpl extends ServiceBaseImpl implements InplaceRecordService, RecordsManagementModel
 {
     /** Site service */
     private SiteService siteService;
 
-    /** Node service */
-    private NodeService nodeService;
-
     /** Extended security service */
     private ExtendedSecurityService extendedSecurityService;
 
@@ -63,14 +59,6 @@ public class InplaceRecordServiceImpl implements InplaceRecordService, RecordsMa
         this.siteService = siteService;
     }
 
-    /**
-     * @param nodeService node service
-     */
-    public void setNodeService(NodeService nodeService)
-    {
-        this.nodeService = nodeService;
-    }
-
     /**
      * @param extendedSecurityService extended security service
      */
@@ -97,7 +85,7 @@ public class InplaceRecordServiceImpl implements InplaceRecordService, RecordsMa
         ParameterCheck.mandatory("NodeRef", nodeRef);
 
         // do the work of hiding the record as the system user
-        AuthenticationUtil.runAsSystem(new RunAsWork<Void>()
+        runAsSystem(new RunAsWork<Void>()
         {
             @Override
             public Void doWork()
@@ -164,7 +152,7 @@ public class InplaceRecordServiceImpl implements InplaceRecordService, RecordsMa
 
         final NodeRef source = sourceParentNodeRef;
 
-        AuthenticationUtil.runAsSystem(new RunAsWork<Void>()
+        runAsSystem(new RunAsWork<Void>()
         {
             @Override
             public Void doWork()
@@ -186,5 +174,4 @@ public class InplaceRecordServiceImpl implements InplaceRecordService, RecordsMa
             }
         });
     }
-
 }