Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD

47670: ALF-18245 - BM-0013: Soak: Run 06: Search population of ScriptNode is expensive
          - Optimizations to improve the performance of the repository when retrieving the populating data needed for Share Search results
          - Additional service method to PersonService to allow retrieval of a person or null in a single operation - rather than exists() followed get()
          - Improvements to generate of full name strings for a Person - only retrieve minimum needed properties rather than allprops from cm:person
          - Improvements to generation of DisplayPath to avoid multiple permission checks

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47674 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2013-03-06 16:52:09 +00:00
parent 6652e37815
commit 80887b8462
7 changed files with 122 additions and 25 deletions

View File

@@ -837,23 +837,41 @@ public final class People extends BaseScopableProcessorExtension implements Init
peopleRefs.toArray(people);
return people;
}
}
/**
* Gets the Person given the username
*
* @param username the username of the person to get
* @return the person node (type cm:person) or null if no such person exists
*/
public ScriptNode getPerson(String username)
public ScriptNode getPerson(final String username)
{
ParameterCheck.mandatoryString("Username", username);
ScriptNode person = null;
if (personService.personExists(username))
final NodeRef personRef = personService.getPerson(username, false);
return new ScriptNode(personRef, services, getScope());
}
/**
* Faster helper when the script just wants to build the Full name for a person.
* Avoids complete getProperties() retrieval for a cm:person.
*
* @param username the username of the person to get Full name for
* @return full name for a person or null if the user does not exist in the system.
*/
public String getPersonFullName(final String username)
{
String name = null;
ParameterCheck.mandatoryString("Username", username);
final NodeRef personRef = personService.getPersonOrNull(username);
if (personRef != null)
{
NodeRef personRef = personService.getPerson(username);
person = new ScriptNode(personRef, services, getScope());
final NodeService nodeService = services.getNodeService();
final String firstName = (String)nodeService.getProperty(personRef, ContentModel.PROP_FIRSTNAME);
final String lastName = (String)nodeService.getProperty(personRef, ContentModel.PROP_LASTNAME);
name = (firstName != null ? firstName + " " : "") + (lastName != null ? lastName : "");
}
return person;
return name;
}
/**

View File

@@ -22,10 +22,12 @@ import java.util.Date;
import java.util.Locale;
import java.util.Map;
import org.alfresco.repo.security.permissions.noop.PermissionServiceNOOPImpl;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.module.ModuleDetails;
import org.alfresco.service.cmr.module.ModuleService;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.ScriptPagingDetails;
@@ -40,10 +42,13 @@ import org.springframework.extensions.surf.util.ISO8601DateFormat;
public class ScriptUtils extends BaseScopableProcessorExtension
{
private final static String NAMESPACE_BEGIN = "" + QName.NAMESPACE_BEGIN;
/** Services */
private ServiceRegistry services;
private NodeService unprotNodeService;
/**
* Sets the service registry
*
@@ -54,6 +59,26 @@ public class ScriptUtils extends BaseScopableProcessorExtension
this.services = services;
}
/**
* @param nodeService the NodeService to set
*/
public void setNodeService(NodeService nodeService)
{
this.unprotNodeService = nodeService;
}
/**
* Function to return the cm:name display path for a node with minimum performance overhead.
*
* @param node ScriptNode
* @return cm:name based human readable display path for the give node.
*/
public String displayPath(ScriptNode node)
{
return this.unprotNodeService.getPath(node.nodeRef).toDisplayPath(
this.unprotNodeService, new PermissionServiceNOOPImpl());
}
/**
* Function to pad a string with zero '0' characters to the required length
*