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 Performance Improvements:

Browse Source 
* focus on in-place scenarios with large numbers of DM users and large numbers of in-place records (based on issue informally reported by partner)
 * improve performance of dynamic authorities used for in-place security evaluation (L1 transaction cache and more preformant authority look up)
 * remove unwanted queries in tree (N+1 for every node) .. killed it for large file plans
 * L1 transaction cache for capability condition evaluation .. these are called a LOT so removes some of the bottle necks when evaluating the permissions of a large sets of nodes
 * extend helper system test used to load up fileplan and now also create in-place records
 * unit and integration tests run .. sanity testing done via the UI
 * overall performance of the display of 1000 in-place records in the file plan down from minutes to a few seconds!



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@75186 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2014-06-28 04:54:04 +00:00
parent 1996a4dc85
commit 75c8dbc579
37 changed files with 267 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-treenode.get.js
View File

@@ -20,7 +20,7 @@ function getTreenode()
"{http://www.alfresco.org/model/recordsmanagement/1.0}unfiledRecordContainer":true
},
skipPermissionCheck = args["perms"] == "false",
evalChildFolders = args["children"] !== "false",
evalChildFolders = false,
item, rmNode, capabilities, cap;
// Use helper function to get the arguments

1
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMSecurityCommon.java
View File

@@ -38,6 +38,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.extensions.webscripts.GUID;
/**

34
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/AbstractCapabilityCondition.java
View File

@@ -18,12 +18,17 @@
*/
package org.alfresco.module.org_alfresco_module_rm.capability.declarative;
import java.util.Map;
import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService;
import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
import org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService;
import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
import org.alfresco.module.org_alfresco_module_rm.record.RecordService;
import org.alfresco.module.org_alfresco_module_rm.recordfolder.RecordFolderService;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.transaction.TransactionalResourceHelper;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.security.PermissionService;
import org.springframework.beans.factory.BeanNameAware;
@@ -37,6 +42,9 @@ public abstract class AbstractCapabilityCondition implements CapabilityCondition
BeanNameAware,
RecordsManagementModel
{
/** transaction cache key */
private static final String KEY_EVALUATE = "rm.transaction.evaluate";
/** Capability condition name */
protected String name;
@@ -114,6 +122,32 @@ public abstract class AbstractCapabilityCondition implements CapabilityCondition
return name;
}
/**
* @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public boolean evaluate(NodeRef nodeRef)
{
boolean result = false;
// check transaction cache
Map<String, Boolean> map = TransactionalResourceHelper.getMap(KEY_EVALUATE);
String key = getName() + "|" + nodeRef.toString() + "|" + AuthenticationUtil.getRunAsUser();
if (map.containsKey(key))
{
result = map.get(key);
}
else
{
result = evaluateImpl(nodeRef);
map.put(key, result);
}
return result;
}
public abstract boolean evaluateImpl(NodeRef nodeRef);
/**
* @see org.springframework.beans.factory.BeanNameAware#setBeanName(java.lang.String)
*/

17
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/CapabilityCondition.java
View File

@@ -20,9 +20,26 @@ package org.alfresco.module.org_alfresco_module_rm.capability.declarative;
import org.alfresco.service.cmr.repository.NodeRef;
/**
* Capability condition.
*
* @author Roy Wetherall
* @since 2.0
*/
public interface CapabilityCondition
{
/**
* Get capability condition name
*
* @return {@link String} capability condition name
*/
String getName();
/**
* Evaluates capability condition.
*
* @param nodeRef node reference
* @return boolean true if evaluate success, false otherwise
*/
boolean evaluate(NodeRef nodeRef);
}

8
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/AtLeastOneCondition.java
View File

@@ -43,11 +43,17 @@ public class AtLeastOneCondition extends AbstractCapabilityCondition
this.conditions = conditions;
}
@Override
public boolean evaluate(NodeRef nodeRef)
{
return evaluateImpl(nodeRef);
}
/**
* @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public boolean evaluate(NodeRef nodeRef)
public boolean evaluateImpl(NodeRef nodeRef)
{
boolean result = false;

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/ClosedCapabilityCondition.java
View File

@@ -35,7 +35,7 @@ public class ClosedCapabilityCondition extends AbstractCapabilityCondition
* @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public boolean evaluate(NodeRef nodeRef)
public boolean evaluateImpl(NodeRef nodeRef)
{
boolean result = false;
if (recordFolderService.isRecordFolder(nodeRef))

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/CutoffCapabilityCondition.java
View File

@@ -32,7 +32,7 @@ public class CutoffCapabilityCondition extends AbstractCapabilityCondition
* @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public boolean evaluate(NodeRef nodeRef)
public boolean evaluateImpl(NodeRef nodeRef)
{
// determine whether the item is already cutt off
return dispositionService.isDisposableItemCutoff(nodeRef);

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/DeclaredCapabilityCondition.java
View File

@@ -28,7 +28,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
public class DeclaredCapabilityCondition extends AbstractCapabilityCondition
{
@Override
public boolean evaluate(NodeRef nodeRef)
public boolean evaluateImpl(NodeRef nodeRef)
{
boolean result = false;
if (FilePlanComponentKind.RECORD.equals(filePlanService.getFilePlanComponentKind(nodeRef)))

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/DestroyedCapabilityCondition.java
View File

@@ -29,7 +29,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
public class DestroyedCapabilityCondition extends AbstractCapabilityCondition
{
@Override
public boolean evaluate(NodeRef nodeRef)
public boolean evaluateImpl(NodeRef nodeRef)
{
return nodeService.hasAspect(nodeRef, ASPECT_GHOSTED);
}

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FailCapabilityCondition.java
View File

@@ -30,7 +30,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
public class FailCapabilityCondition extends AbstractCapabilityCondition
{
@Override
public boolean evaluate(NodeRef nodeRef)
public boolean evaluateImpl(NodeRef nodeRef)
{
return false;
}

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FileableCapabilityCondition.java
View File

@@ -47,7 +47,7 @@ public class FileableCapabilityCondition extends AbstractCapabilityCondition
* @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public boolean evaluate(NodeRef nodeRef)
public boolean evaluateImpl(NodeRef nodeRef)
{
QName type = nodeService.getType(nodeRef);
// TODO and not already a record?

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FillingCapabilityCondition.java
View File

@@ -34,7 +34,7 @@ public class FillingCapabilityCondition extends AbstractCapabilityCondition
* @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public boolean evaluate(NodeRef nodeRef)
public boolean evaluateImpl(NodeRef nodeRef)
{
boolean result = false;

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FrozenCapabilityCondition.java
View File

@@ -34,7 +34,7 @@ private boolean checkChildren = false;
}
@Override
public boolean evaluate(NodeRef nodeRef)
public boolean evaluateImpl(NodeRef nodeRef)
{
boolean result = freezeService.isFrozen(nodeRef);
if (!result && checkChildren)

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FrozenOrHoldCondition.java
View File

@@ -33,7 +33,7 @@ public class FrozenOrHoldCondition extends AbstractCapabilityCondition
* @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public boolean evaluate(NodeRef nodeRef)
public boolean evaluateImpl(NodeRef nodeRef)
{
FilePlanComponentKind kind = filePlanService.getFilePlanComponentKind(nodeRef);
return (freezeService.isFrozen(nodeRef) ||

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasAspectCapabilityCondition.java
View File

@@ -46,7 +46,7 @@ public class HasAspectCapabilityCondition extends AbstractCapabilityCondition
* @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public boolean evaluate(NodeRef nodeRef)
public boolean evaluateImpl(NodeRef nodeRef)
{
boolean result = false;
if (aspectName != null)

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasDispositionDateCapabilityCondition.java
View File

@@ -45,7 +45,7 @@ public class HasDispositionDateCapabilityCondition extends AbstractCapabilityCon
* @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public boolean evaluate(NodeRef nodeRef)
public boolean evaluateImpl(NodeRef nodeRef)
{
boolean result = false;

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasEventsCapabilityCondition.java
View File

@@ -45,7 +45,7 @@ public class HasEventsCapabilityCondition extends AbstractCapabilityCondition
* @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public boolean evaluate(NodeRef nodeRef)
public boolean evaluateImpl(NodeRef nodeRef)
{
boolean result = false;

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HoldCapabilityCondition.java
View File

@@ -58,7 +58,7 @@ public class HoldCapabilityCondition extends AbstractCapabilityCondition
}
@Override
public boolean evaluate(NodeRef nodeRef)
public boolean evaluateImpl(NodeRef nodeRef)
{
boolean result = false;

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsClassifiedCapabilityCondition.java
View File

@@ -46,7 +46,7 @@ public class IsClassifiedCapabilityCondition extends AbstractCapabilityCondition
* @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public boolean evaluate(NodeRef nodeRef)
public boolean evaluateImpl(NodeRef nodeRef)
{
boolean result = false;

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsPropertySetCondition.java
View File

@@ -66,7 +66,7 @@ public class IsPropertySetCondition extends AbstractCapabilityCondition
* @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public boolean evaluate(NodeRef nodeRef)
public boolean evaluateImpl(NodeRef nodeRef)
{
ParameterCheck.mandatory("nodeRef", nodeRef);

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsRecordCategoryCondition.java
View File

@@ -34,7 +34,7 @@ public class IsRecordCategoryCondition extends AbstractCapabilityCondition
* @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public boolean evaluate(NodeRef nodeRef)
public boolean evaluateImpl(NodeRef nodeRef)
{
ParameterCheck.mandatory("nodeRef", nodeRef);

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsRecordCondition.java
View File

@@ -34,7 +34,7 @@ public class IsRecordCondition extends AbstractCapabilityCondition
* @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public boolean evaluate(NodeRef nodeRef)
public boolean evaluateImpl(NodeRef nodeRef)
{
ParameterCheck.mandatory("nodeRef", nodeRef);

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsRecordFolderCondition.java
View File

@@ -34,7 +34,7 @@ public class IsRecordFolderCondition extends AbstractCapabilityCondition
* @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public boolean evaluate(NodeRef nodeRef)
public boolean evaluateImpl(NodeRef nodeRef)
{
ParameterCheck.mandatory("nodeRef", nodeRef);

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsScheduledCapabilityCondition.java
View File

@@ -56,7 +56,7 @@ public class IsScheduledCapabilityCondition extends AbstractCapabilityCondition
* @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public boolean evaluate(NodeRef nodeRef)
public boolean evaluateImpl(NodeRef nodeRef)
{
boolean result = false;

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsTransferAccessionCapabilityCondition.java
View File

@@ -31,7 +31,7 @@ public class IsTransferAccessionCapabilityCondition extends AbstractCapabilityCo
* @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public boolean evaluate(NodeRef nodeRef)
public boolean evaluateImpl(NodeRef nodeRef)
{
boolean result = false;

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/LastDispositionActionCondition.java
View File

@@ -48,7 +48,7 @@ public class LastDispositionActionCondition extends AbstractCapabilityCondition
* @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public boolean evaluate(NodeRef nodeRef)
public boolean evaluateImpl(NodeRef nodeRef)
{
boolean result = false;
DispositionAction dispositionAction = dispositionService.getLastCompletedDispostionAction(nodeRef);

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/MayBeScheduledCapabilityCondition.java
View File

@@ -57,7 +57,7 @@ public class MayBeScheduledCapabilityCondition extends AbstractCapabilityConditi
* @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public boolean evaluate(NodeRef nodeRef)
public boolean evaluateImpl(NodeRef nodeRef)
{
boolean result = false;

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/RecordFiledCapabilityCondition.java
View File

@@ -33,7 +33,7 @@ public class RecordFiledCapabilityCondition extends AbstractCapabilityCondition
* @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public boolean evaluate(NodeRef nodeRef)
public boolean evaluateImpl(NodeRef nodeRef)
{
return recordService.isFiled(nodeRef);
}

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/TransferredCapabilityCondition.java
View File

@@ -28,7 +28,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
public class TransferredCapabilityCondition extends AbstractCapabilityCondition
{
@Override
public boolean evaluate(NodeRef nodeRef)
public boolean evaluateImpl(NodeRef nodeRef)
{
return nodeService.hasAspect(nodeRef, RecordsManagementModel.ASPECT_TRANSFERRED);
}

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/VitalRecordOrFolderCapabilityCondition.java
View File

@@ -28,7 +28,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
public class VitalRecordOrFolderCapabilityCondition extends AbstractCapabilityCondition
{
@Override
public boolean evaluate(NodeRef nodeRef)
public boolean evaluateImpl(NodeRef nodeRef)
{
boolean result = false;

23
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityBaseDynamicAuthority.java
View File

@@ -18,15 +18,16 @@
*/
package org.alfresco.module.org_alfresco_module_rm.security;
import java.util.Map;
import java.util.Set;
import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
import org.alfresco.repo.security.permissions.DynamicAuthority;
import org.alfresco.repo.security.permissions.PermissionReference;
import org.alfresco.repo.transaction.TransactionalResourceHelper;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.security.AuthorityService;
import org.alfresco.service.cmr.security.AuthorityType;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
@@ -40,6 +41,9 @@ public abstract class ExtendedSecurityBaseDynamicAuthority implements DynamicAut
RecordsManagementModel,
ApplicationContextAware
{
/** transaction cache key */
private static final String KEY_HAS_AUTHORITY_CACHE = "rm.transaction.hasAuthority";
/** Authority service */
private AuthorityService authorityService;
@@ -132,15 +136,24 @@ public abstract class ExtendedSecurityBaseDynamicAuthority implements DynamicAut
}
else if (authority.startsWith("GROUP_"))
{
// check group to see if the user is contained
Set<String> contained = getAuthorityService().getContainedAuthorities(AuthorityType.USER, authority, false);
if (!contained.isEmpty() &&
contained.contains(userName))
Map<String, Boolean> transactionCache = TransactionalResourceHelper.getMap(KEY_HAS_AUTHORITY_CACHE);
String key = authority + "|" + userName;
if (transactionCache.containsKey(key))
{
result = transactionCache.get(key);
break;
}
else
{
Set<String> contained = getAuthorityService().getAuthoritiesForUser(userName);
if (contained.contains(authority))
{
result = true;
transactionCache.put(key, result);
break;
}
}
}
else
{
// presume we have a user

14
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/ServiceBaseImpl.java
View File

@@ -28,6 +28,7 @@ import org.alfresco.module.org_alfresco_module_rm.hold.HoldService;
import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
import org.alfresco.repo.transaction.TransactionalResourceHelper;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
@@ -107,6 +108,13 @@ public class ServiceBaseImpl implements RecordsManagementModel, ApplicationConte
{
FilePlanComponentKind result = null;
Map<NodeRef, FilePlanComponentKind> map = TransactionalResourceHelper.getMap("rm.transaction.filePlanComponentByNodeRef");
if (map.containsKey(nodeRef))
{
result = map.get(nodeRef);
}
else
{
if (isFilePlanComponent(nodeRef))
{
result = FilePlanComponentKind.FILE_PLAN_COMPONENT;
@@ -157,6 +165,12 @@ public class ServiceBaseImpl implements RecordsManagementModel, ApplicationConte
}
}
if (result != null)
{
map.put(nodeRef, result);
}
}
return result;
}

8
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/recordfolder/MoveRecordFolderTest.java
View File

@@ -415,11 +415,15 @@ public class MoveRecordFolderTest extends BaseRMTestCase
// cutoff folder
rmActionService.executeRecordsManagementAction(testFolder, CutOffAction.NAME);
return testFolder;
}
@Override
public void test(NodeRef testFolder) throws Exception
{
// take a look at the move capability
Capability moveCapability = capabilityService.getCapability("Move");
assertEquals(AccessDecisionVoter.ACCESS_DENIED, moveCapability.evaluate(testFolder, destination));
return testFolder;
}
});

21
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/FileReportActionTest.java
View File

@@ -56,6 +56,9 @@ public class FileReportActionTest extends BaseRMTestCase
// create record folder
final NodeRef recordFolder = recordFolderService.createRecordFolder(rmContainer, GUID.generate());
// close the record folder
recordFolderService.closeRecordFolder(recordFolder);
// create hold
final NodeRef hold = holdService.createHold(filePlan, "holdName", "holdReason", "holdDescription");
@@ -64,9 +67,6 @@ public class FileReportActionTest extends BaseRMTestCase
@Override
public void run() throws Exception
{
// close the record folder
recordFolderService.closeRecordFolder(recordFolder);
// execute action
executeAction(mimeType, recordFolder, hold);
}
@@ -77,14 +77,17 @@ public class FileReportActionTest extends BaseRMTestCase
public Void run()
{
// reopen the record folder
nodeService.setProperty(recordFolder, PROP_IS_CLOSED, false);
// execute action
executeAction(mimeType, recordFolder, hold);
rmActionService.executeRecordsManagementAction(recordFolder, "openRecordFolder");
return null;
}
}, ADMIN_USER);
@Override
public void test(Void result) throws Exception
{
// execute action
executeAction(mimeType, recordFolder, hold);
}
});
}
private void executeAction(String mimeType, NodeRef recordFolder, NodeRef hold)

71
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/system/DataLoadSystemTest.java
View File

@@ -7,6 +7,7 @@ import java.util.List;
import java.util.Map;
import org.alfresco.model.ContentModel;
import org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementActionService;
import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
import org.alfresco.module.org_alfresco_module_rm.record.RecordService;
import org.alfresco.module.org_alfresco_module_rm.recordfolder.RecordFolderService;
@@ -15,11 +16,15 @@ import org.alfresco.module.org_alfresco_module_rm.test.util.CommonRMTestUtils;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.service.cmr.model.FileFolderService;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.security.AuthorityService;
import org.alfresco.service.cmr.security.AuthorityType;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteRole;
import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.namespace.QName;
import org.alfresco.service.transaction.TransactionService;
import org.alfresco.util.ApplicationContextHelper;
@@ -40,6 +45,8 @@ public class DataLoadSystemTest
protected MutableAuthenticationService authenticationService;
protected PersonService personService;
protected FilePlanRoleService filePlanRoleService;
protected SiteService siteService;
protected FileFolderService fileFolderService;
/** config locations */
protected String[] getConfigLocations()
@@ -63,6 +70,10 @@ public class DataLoadSystemTest
private static final int RM_GROUP_COUNT = 0;
private static final int RM_USER_COUNT = 0;
/** inplace sizing */
private static final int USER_COUNT = 0;
private static final int INPLACE_RECORD_COUNT = 5000;
/** application context */
private ApplicationContext applicationContext;
CommonRMTestUtils utils;
@@ -86,13 +97,71 @@ public class DataLoadSystemTest
authenticationService = (MutableAuthenticationService)applicationContext.getBean("AuthenticationService");
personService = (PersonService)applicationContext.getBean("personService");
filePlanRoleService = (FilePlanRoleService)applicationContext.getBean("filePlanRoleService");
siteService = (SiteService)applicationContext.getBean("siteService");
fileFolderService = (FileFolderService)applicationContext.getBean("fileFolderService");
}
@Test
private void loadAllData()
public void loadAllData()
{
loadFilePlanData();
loadRMUsersAndGroups();
loadInPlace();
}
private void loadInPlace()
{
AuthenticationUtil.runAs(new RunAsWork<Void>()
{
public Void doWork() throws Exception
{
final SiteInfo site = siteService.getSite("test");
if (site == null)
{
Assert.fail("The collab site test is not present.");
}
final NodeRef filePlan = filePlanService.getFilePlanBySiteId(FilePlanService.DEFAULT_RM_SITE_ID);
if (filePlan == null)
{
Assert.fail("The default RM site is not present.");
}
// create users and add to site
repeatInTransactionBatches(new RunAsWork<Void>()
{
public Void doWork() throws Exception
{
// create user
String userName = GUID.generate();
System.out.println("Creating user " + userName);
createPerson(userName, true);
// add to collab site
siteService.setMembership("test", userName, SiteRole.SiteCollaborator.toString());
return null;
}
}, USER_COUNT);
// create content and declare as record
repeatInTransactionBatches(new RunAsWork<Void>()
{
public Void doWork() throws Exception
{
// create document
NodeRef docLib = siteService.getContainer(site.getShortName(), SiteService.DOCUMENT_LIBRARY);
NodeRef document = fileFolderService.create(docLib, GUID.generate(), ContentModel.TYPE_CONTENT).getNodeRef();
recordService.createRecord(filePlan, document);
return null;
}
}, INPLACE_RECORD_COUNT);
return null;
}
}, AuthenticationUtil.getAdminUserName());
}

6
rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HoldCapabilityConditionUnitTest.java
View File

@@ -94,7 +94,7 @@ public class HoldCapabilityConditionUnitTest extends BaseUnitTest
doReturn(Collections.EMPTY_LIST).when(mockedHoldService).heldBy(eq(recordFolder), anyBoolean());
// when
boolean result = evaluator.evaluate(recordFolder);
boolean result = evaluator.evaluateImpl(recordFolder);
// then
assertFalse(result);
@@ -114,7 +114,7 @@ public class HoldCapabilityConditionUnitTest extends BaseUnitTest
doReturn(AccessStatus.DENIED).when(mockedPermissionService).hasPermission(hold2, RMPermissionModel.FILING);
// when
boolean result = evaluator.evaluate(recordFolder);
boolean result = evaluator.evaluateImpl(recordFolder);
// then
assertFalse(result);
@@ -134,7 +134,7 @@ public class HoldCapabilityConditionUnitTest extends BaseUnitTest
doReturn(AccessStatus.ALLOWED).when(mockedPermissionService).hasPermission(hold2, RMPermissionModel.FILING);
// when
boolean result = evaluator.evaluate(recordFolder);
boolean result = evaluator.evaluateImpl(recordFolder);
// then
assertTrue(result);

12
rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanPermissionServiceImplUnitTest.java
View File

@@ -31,6 +31,7 @@ import java.util.Set;
import org.alfresco.model.ContentModel;
import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanComponentKind;
import org.alfresco.module.org_alfresco_module_rm.test.util.BaseUnitTest;
import org.alfresco.repo.security.permissions.impl.AccessPermissionImpl;
import org.alfresco.service.cmr.repository.NodeRef;
@@ -128,6 +129,17 @@ public class FilePlanPermissionServiceImplUnitTest extends BaseUnitTest
makeChildrenOf(holdContainer, hold);
makeChildrenOf(hold, heldRecord);
doReturn(FilePlanComponentKind.FILE_PLAN).when(filePlanPermissionService).getFilePlanComponentKind(filePlan);
doReturn(FilePlanComponentKind.RECORD_CATEGORY).when(filePlanPermissionService).getFilePlanComponentKind(rootRecordCategory);
doReturn(FilePlanComponentKind.RECORD_CATEGORY).when(filePlanPermissionService).getFilePlanComponentKind(recordCategory);
doReturn(FilePlanComponentKind.RECORD_FOLDER).when(filePlanPermissionService).getFilePlanComponentKind(newRecordFolder);
doReturn(FilePlanComponentKind.RECORD).when(filePlanPermissionService).getFilePlanComponentKind(newRecord);
doReturn(FilePlanComponentKind.UNFILED_RECORD_FOLDER).when(filePlanPermissionService).getFilePlanComponentKind(unfiledRecordFolder);
doReturn(FilePlanComponentKind.UNFILED_RECORD_CONTAINER).when(filePlanPermissionService).getFilePlanComponentKind(unfiledRecordContainer);
doReturn(FilePlanComponentKind.RECORD).when(filePlanPermissionService).getFilePlanComponentKind(unfiledRecord);
doReturn(FilePlanComponentKind.HOLD_CONTAINER).when(filePlanPermissionService).getFilePlanComponentKind(holdContainer);
doReturn(FilePlanComponentKind.HOLD).when(filePlanPermissionService).getFilePlanComponentKind(hold);
}
/**