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-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
59554: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59450: MNT-9967: Using db-count for process/task entities for retreiving counts, instead of using actual list size (activiti)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62165 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 02:05:13 +00:00
parent 519c2b3cc0
commit 875b90ea55
6 changed files with 540 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/java/org/alfresco/repo/workflow/TaskComponent.java
View File

@@ -81,6 +81,14 @@ public interface TaskComponent
*/
public List<WorkflowTask> queryTasks(final WorkflowTaskQuery query, boolean sameSession);
/**
* Count the number of active tasks that match the given query.
*
* @param query the filter by which tasks are queried
* @return number of matching tasks.
*/
public long countTasks(final WorkflowTaskQuery query);
/**
* Update the Properties and Associations of a Task
*

67
source/java/org/alfresco/repo/workflow/WorkflowServiceImpl.java
View File

@@ -489,20 +489,23 @@ public class WorkflowServiceImpl implements WorkflowService
@Override
public List<WorkflowInstance> getWorkflows(final WorkflowInstanceQuery workflowInstanceQuery, final int maxItems, final int skipCount)
{
if(workflowInstanceQuery.getWorkflowDefinitionId() == null)
{
List<String> ids = Arrays.asList(registry.getWorkflowComponents());
return CollectionUtils.transformFlat(ids, new Function<String, Collection<WorkflowInstance>>()
{
public List<WorkflowInstance> apply(String id)
{
WorkflowComponent component = registry.getWorkflowComponent(id);
return component.getWorkflows(workflowInstanceQuery, maxItems, skipCount);
}
});
}
if(workflowInstanceQuery.getWorkflowDefinitionId() == null && workflowInstanceQuery.getEngineId() == null)
{
List<String> ids = Arrays.asList(registry.getWorkflowComponents());
return CollectionUtils.transformFlat(ids, new Function<String, Collection<WorkflowInstance>>()
{
public List<WorkflowInstance> apply(String id)
{
WorkflowComponent component = registry.getWorkflowComponent(id);
return component.getWorkflows(workflowInstanceQuery, maxItems, skipCount);
}
});
}
String engineId = BPMEngineRegistry.getEngineId(workflowInstanceQuery.getWorkflowDefinitionId());
String engineId = workflowInstanceQuery.getEngineId();
if(engineId == null) {
engineId = BPMEngineRegistry.getEngineId(workflowInstanceQuery.getWorkflowDefinitionId());
}
WorkflowComponent component = getWorkflowComponent(engineId);
return component.getWorkflows(workflowInstanceQuery, maxItems, skipCount);
}
@@ -511,7 +514,7 @@ public class WorkflowServiceImpl implements WorkflowService
public long countWorkflows(final WorkflowInstanceQuery workflowInstanceQuery)
{
// MNT-9074 My Tasks fails to render if tasks quantity is excessive
if (workflowInstanceQuery.getWorkflowDefinitionId() == null)
if (workflowInstanceQuery.getWorkflowDefinitionId() == null && workflowInstanceQuery.getEngineId() == null)
{
List<String> ids = Arrays.asList(registry.getWorkflowComponents());
@@ -526,10 +529,35 @@ public class WorkflowServiceImpl implements WorkflowService
return total;
}
String engineId = BPMEngineRegistry.getEngineId(workflowInstanceQuery.getWorkflowDefinitionId());
String engineId = workflowInstanceQuery.getEngineId();
if(engineId == null) {
engineId = BPMEngineRegistry.getEngineId(workflowInstanceQuery.getWorkflowDefinitionId());
}
WorkflowComponent component = getWorkflowComponent(engineId);
return component.countWorkflows(workflowInstanceQuery);
}
@Override
public long countTasks(WorkflowTaskQuery workflowTaskQuery) {
long total = 0;
if (workflowTaskQuery.getEngineId() != null)
{
TaskComponent component = registry.getTaskComponent(workflowTaskQuery.getEngineId());
total = component.countTasks(workflowTaskQuery);
}
else
{
List<String> ids = Arrays.asList(registry.getTaskComponents());
for (String id : ids)
{
TaskComponent component = registry.getTaskComponent(id);
total += component.countTasks(workflowTaskQuery);
}
}
return total;
}
/**
* {@inheritDoc}
@@ -889,11 +917,16 @@ public class WorkflowServiceImpl implements WorkflowService
public List<WorkflowTask> queryTasks(WorkflowTaskQuery query, boolean sameSession)
{
// extract task component to perform query
String engineId = null;
String engineId = query.getEngineId();
String processId = query.getProcessId();
if (processId != null)
{
engineId = BPMEngineRegistry.getEngineId(processId);
String workflowEngineId = BPMEngineRegistry.getEngineId(processId);
if (engineId != null && !engineId.equals(workflowEngineId)) { throw new WorkflowException(
"Cannot query for tasks across multiple task components: " + engineId + ", " + workflowEngineId);
}
engineId = workflowEngineId;
}
String taskId = query.getTaskId();
if (taskId != null)

874
source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java
View File

File diff suppressed because it is too large Load Diff

5
source/java/org/alfresco/repo/workflow/jbpm/JBPMEngine.java
View File

@@ -906,6 +906,11 @@ public class JBPMEngine extends AlfrescoBpmEngine implements WorkflowEngine
return getWorkflows(workflowInstanceQuery).size();
}
@Override
public long countTasks(WorkflowTaskQuery query) {
return queryTasks(query).size();
}
@SuppressWarnings("unchecked")
private List<ProcessInstance> getProcessInstances(final WorkflowInstanceQuery query)
{