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

Merged HEAD to BRANCHES/V2.1.0.x:

Browse Source 
75186: RM Performance Improvements





git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.1.0.x@76601 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2014-07-16 04:45:57 +00:00
parent be0dd4c598
commit bea661346e
31 changed files with 166 additions and 68 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

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

@@ -18,11 +18,16 @@
*/
package org.alfresco.module.org_alfresco_module_rm.capability.declarative;
import java.util.Map;
import org.alfresco.module.org_alfresco_module_rm.RecordsManagementService;
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.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;
@@ -36,6 +41,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;
@@ -104,6 +112,35 @@ 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;
}
/**
* Condition evaluate implementation
*/
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);
}

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

@@ -44,10 +44,21 @@ public class AtLeastOneCondition extends AbstractCapabilityCondition
}
/**
* @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
* Don't use the transaction cache for the composite condition
*
* @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.AbstractCapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
*/
@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 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 (rmService.isRecordFolder(nodeRef) == true)

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

@@ -30,7 +30,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)
{
return rmService.isCutoff(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)) == true)

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 == false && checkChildren == true)

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/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;

24
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.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
@@ -41,6 +42,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;
@@ -133,15 +137,25 @@ public abstract class ExtendedSecurityBaseDynamicAuthority implements DynamicAut
}
else if (authority.startsWith("GROUP_") == true)
{
// check group to see if the user is contained
Set<String> contained = getAuthorityService().getContainedAuthorities(AuthorityType.USER, authority, false);
if (contained.isEmpty() == false &&
contained.contains(userName) == true)
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

@@ -27,6 +27,7 @@ import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
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;
@@ -106,6 +107,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;
@@ -144,6 +152,12 @@ public class ServiceBaseImpl implements RecordsManagementModel, ApplicationConte
}
}
if (result != null)
{
map.put(nodeRef, result);
}
}
return result;
}

9
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM1039Test.java
View File

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