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

Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (PARTIAL MERGE)

Browse Source 
124190 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      124132 arebegea: MNT-15573 : Site finder slow for a user who's member of many sites
         - added a new method to InvitationService to make use of the limit in the searchInvitation
         - sent and used the 200 limit from the site-finder.get.js in the script/ScriptInvitationService.java and passed the new parameter
         - for searchModeratedInvitations and searchNominatedInvitations methods of InvitationServiceImpl.java I added the use of the limit parameter
         - added some comments on ActivitiWorkflowEngine.java and TaskComponent.java to inform developers about the performance issues and possible improvement
         - added junit tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@124236 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-03-18 12:57:18 +00:00
parent 143b52b51c
commit 45c9d15805
6 changed files with 162 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
source/java/org/alfresco/repo/invitation/script/ScriptInvitationService.java
View File

@@ -48,6 +48,8 @@ public class ScriptInvitationService extends BaseScopableProcessorExtension
implements InitializingBean
{
static final int DEFAULT_MAX_LIST_INVITATIONS_RETURN_SIZE = 200;
/** The invitation service */
private InvitationService invitationService;
@@ -101,7 +103,13 @@ public class ScriptInvitationService extends BaseScopableProcessorExtension
* List the open invitations.
* props specifies optional properties to constrain the search.
*
* @param props props
* By default, if no "resultsLimit" property is specified in the props argument,
* this method will return a maximum of DEFAULT_MAX_LIST_INVITATIONS_RETURN_SIZE (200) results
*
* @param props inviteeUserName
* @param props resourceName
* @param props resourceType
* @param props invitationType
*
* @return the invitations
*/
@@ -109,7 +117,9 @@ public class ScriptInvitationService extends BaseScopableProcessorExtension
public ScriptInvitation<?>[] listInvitations(Scriptable props)
{
InvitationSearchCriteriaImpl crit = new InvitationSearchCriteriaImpl();
int resultsLimit = DEFAULT_MAX_LIST_INVITATIONS_RETURN_SIZE;
if (props.has("resourceName", props))
{
crit.setResourceName((String)props.get("resourceName", props));
@@ -127,6 +137,21 @@ public class ScriptInvitationService extends BaseScopableProcessorExtension
String invitationType = (String)props.get("invitationType", props);
crit.setInvitationType(InvitationType.valueOf(invitationType));
}
if (props.has("resultsLimit", props))
{
String resultsLimitStr = (String) props.get("resultsLimit", props);
try
{
if (resultsLimitStr != null && !resultsLimitStr.isEmpty())
{
resultsLimit = Integer.parseInt(resultsLimitStr);
}
}
catch (Exception e)
{
// ignore any parse exceptions; no need to log them
}
}
//MNT-9905 Pending Invites created by one site manager aren't visible to other site managers
String currentUser = AuthenticationUtil.getRunAsUser();
@@ -136,12 +161,12 @@ public class ScriptInvitationService extends BaseScopableProcessorExtension
if (siteShortName != null && (SiteModel.SITE_MANAGER).equals(siteService.getMembersRole(siteShortName, currentUser)))
{
final InvitationSearchCriteriaImpl criteria = crit;
final int resultsLimitFinal = resultsLimit;
RunAsWork<List<Invitation>> runAsSystem = new RunAsWork<List<Invitation>>()
{
public List<Invitation> doWork() throws Exception
{
return invitationService.searchInvitation(criteria);
return invitationService.searchInvitation(criteria, resultsLimitFinal);
}
};
@@ -149,7 +174,7 @@ public class ScriptInvitationService extends BaseScopableProcessorExtension
}
else
{
invitations = invitationService.searchInvitation(crit);
invitations = invitationService.searchInvitation(crit, resultsLimit);
}
ScriptInvitation<?>[] ret = new ScriptInvitation[invitations.size()];