inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

RM-1623 (Move In-Place Record)

Browse Source 
* 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
This commit is contained in:
Tuna Aksoy
2014-08-21 08:02:07 +00:00
parent d1ba3bf7bd
commit a64f4db528
2 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
View File

@@ -1107,14 +1107,13 @@
</bean> </bean>
<!-- Inplace Record Service --> <!-- 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="siteService" ref="SiteService" />
<property name="nodeService" ref="NodeService" />
<property name="extendedSecurityService" ref="ExtendedSecurityService" /> <property name="extendedSecurityService" ref="ExtendedSecurityService" />
<property name="fileFolderService" ref="FileFolderService" /> <property name="fileFolderService" ref="FileFolderService" />
</bean> </bean>
<bean id="InplaceRecordService" class="org.springframework.aop.framework.ProxyFactoryBean"> <bean id="InplaceRecordService" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces"> <property name="proxyInterfaces">
<value>org.alfresco.module.org_alfresco_module_rm.record.InplaceRecordService</value> <value>org.alfresco.module.org_alfresco_module_rm.record.InplaceRecordService</value>

21
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/InplaceRecordServiceImpl.java
View File

@@ -23,14 +23,13 @@ import java.util.List;
import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel; import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
import org.alfresco.module.org_alfresco_module_rm.security.ExtendedSecurityService; 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.repo.security.authentication.AuthenticationUtil.RunAsWork;
import org.alfresco.service.cmr.model.FileExistsException; import org.alfresco.service.cmr.model.FileExistsException;
import org.alfresco.service.cmr.model.FileFolderService; import org.alfresco.service.cmr.model.FileFolderService;
import org.alfresco.service.cmr.model.FileNotFoundException; import org.alfresco.service.cmr.model.FileNotFoundException;
import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef; 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.SiteInfo;
import org.alfresco.service.cmr.site.SiteService; import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.util.ParameterCheck; import org.alfresco.util.ParameterCheck;
@@ -41,14 +40,11 @@ import org.alfresco.util.ParameterCheck;
* @author Tuna Aksoy * @author Tuna Aksoy
* @since 2.3 * @since 2.3
*/ */
public class InplaceRecordServiceImpl implements InplaceRecordService, RecordsManagementModel public class InplaceRecordServiceImpl extends ServiceBaseImpl implements InplaceRecordService, RecordsManagementModel
{ {
/** Site service */ /** Site service */
private SiteService siteService; private SiteService siteService;
/** Node service */
private NodeService nodeService;
/** Extended security service */ /** Extended security service */
private ExtendedSecurityService extendedSecurityService; private ExtendedSecurityService extendedSecurityService;
@@ -63,14 +59,6 @@ public class InplaceRecordServiceImpl implements InplaceRecordService, RecordsMa
this.siteService = siteService; this.siteService = siteService;
} }
/**
* @param nodeService node service
*/
public void setNodeService(NodeService nodeService)
{
this.nodeService = nodeService;
}
/** /**
* @param extendedSecurityService extended security service * @param extendedSecurityService extended security service
*/ */
@@ -97,7 +85,7 @@ public class InplaceRecordServiceImpl implements InplaceRecordService, RecordsMa
ParameterCheck.mandatory("NodeRef", nodeRef); ParameterCheck.mandatory("NodeRef", nodeRef);
// do the work of hiding the record as the system user // do the work of hiding the record as the system user
AuthenticationUtil.runAsSystem(new RunAsWork<Void>() runAsSystem(new RunAsWork<Void>()
{ {
@Override @Override
public Void doWork() public Void doWork()
@@ -164,7 +152,7 @@ public class InplaceRecordServiceImpl implements InplaceRecordService, RecordsMa
final NodeRef source = sourceParentNodeRef; final NodeRef source = sourceParentNodeRef;
AuthenticationUtil.runAsSystem(new RunAsWork<Void>() runAsSystem(new RunAsWork<Void>()
{ {
@Override @Override
public Void doWork() public Void doWork()
@@ -186,5 +174,4 @@ public class InplaceRecordServiceImpl implements InplaceRecordService, RecordsMa
} }
}); });
} }
} }