[jbpm-commits] JBoss JBPM SVN: r4547 - in jbpm4/trunk/modules: api/src/main/java/org/jbpm/history and 11 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Apr 14 05:47:58 EDT 2009
Author: tom.baeyens at jboss.com
Date: 2009-04-14 05:47:58 -0400 (Tue, 14 Apr 2009)
New Revision: 4547
Modified:
jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionQuery.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/JobQuery.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessDefinitionQuery.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskQuery.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryActivityInstanceQuery.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryProcessInstanceQuery.java
jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/repository/JpdlDeployer.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteDeploymentCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ExecutionQueryImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryActivityInstanceQueryImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryProcessInstanceQueryImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/JobQueryImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessDefinitionQueryImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java
jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/EndProcessInstanceTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/ProcessDefinitionQueryTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/RepositoryServiceTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskHandlerTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskQueryTest.java
Log:
JBPM-2168 align query methods list and uniqueResult with hibernate
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionQuery.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionQuery.java 2009-04-14 09:11:49 UTC (rev 4546)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionQuery.java 2009-04-14 09:47:58 UTC (rev 4547)
@@ -40,6 +40,6 @@
ExecutionQuery page(int firstResult, int maxResults);
- List<Execution> execute();
- Execution executeUniqueResult();
+ List<Execution> list();
+ Execution uniqueResult();
}
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/JobQuery.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/JobQuery.java 2009-04-14 09:11:49 UTC (rev 4546)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/JobQuery.java 2009-04-14 09:47:58 UTC (rev 4547)
@@ -43,5 +43,6 @@
JobQuery page(int firstResult, int maxResults);
- List<Job> execute();
+ List<Job> list();
+ Job uniqueResult();
}
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessDefinitionQuery.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessDefinitionQuery.java 2009-04-14 09:11:49 UTC (rev 4546)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessDefinitionQuery.java 2009-04-14 09:47:58 UTC (rev 4547)
@@ -45,6 +45,6 @@
ProcessDefinitionQuery page(int firstResult, int maxResults);
- List<ProcessDefinition> execute();
+ List<ProcessDefinition> list();
ProcessDefinition uniqueResult();
}
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskQuery.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskQuery.java 2009-04-14 09:11:49 UTC (rev 4546)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskQuery.java 2009-04-14 09:47:58 UTC (rev 4547)
@@ -53,5 +53,6 @@
TaskQuery orderAsc(String property);
TaskQuery orderDesc(String property);
- List<Task> execute();
+ List<Task> list();
+ Task uniqueResult();
}
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryActivityInstanceQuery.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryActivityInstanceQuery.java 2009-04-14 09:11:49 UTC (rev 4546)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryActivityInstanceQuery.java 2009-04-14 09:47:58 UTC (rev 4547)
@@ -24,7 +24,9 @@
import java.util.Date;
import java.util.List;
+import org.jbpm.task.Task;
+
/**
* @author Tom Baeyens
*/
@@ -52,5 +54,6 @@
HistoryActivityInstanceQuery page(int firstResult, int maxResults);
- List<HistoryActivityInstance> execute();
+ List<HistoryActivityInstance> list();
+ HistoryActivityInstance uniqueResult();
}
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryProcessInstanceQuery.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryProcessInstanceQuery.java 2009-04-14 09:11:49 UTC (rev 4546)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryProcessInstanceQuery.java 2009-04-14 09:47:58 UTC (rev 4547)
@@ -45,6 +45,6 @@
HistoryProcessInstanceQuery page(int firstResult, int maxResults);
- List<HistoryProcessInstance> execute();
- HistoryProcessInstance executeUniqueResult();
+ List<HistoryProcessInstance> list();
+ HistoryProcessInstance uniqueResult();
}
Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java
===================================================================
--- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java 2009-04-14 09:11:49 UTC (rev 4546)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java 2009-04-14 09:47:58 UTC (rev 4547)
@@ -55,7 +55,7 @@
RepositoryService repositoryService = this.processEngine.getRepositoryService();
List<ProcessDefinition> definitions = repositoryService.createProcessDefinitionQuery()
.orderAsc(ProcessDefinitionQuery.PROPERTY_NAME)
- .execute();
+ .list();
// adopt ProcessDefinition to console model
for(ProcessDefinition processDefinition : definitions)
@@ -125,7 +125,7 @@
ExecutionQuery query = execService.createExecutionQuery();
query.processDefinitionId(String.valueOf(procDefId));
- List<Execution> executions = query.execute();
+ List<Execution> executions = query.list();
List<ProcessInstanceRef> results = adoptTopLevelExecutions(executions);
@@ -177,7 +177,7 @@
ExecutionService execService = this.processEngine.getExecutionService();
ExecutionQuery query = execService.createProcessInstanceQuery();
query.processInstanceId(instanceId);
- List<Execution> executions = query.execute();
+ List<Execution> executions = query.list();
if(executions.size()>1 || executions.isEmpty())
throw new IllegalStateException("No precise match for instanceId " + instanceId +". Num results "+executions);
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/repository/JpdlDeployer.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/repository/JpdlDeployer.java 2009-04-14 09:11:49 UTC (rev 4546)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/repository/JpdlDeployer.java 2009-04-14 09:47:58 UTC (rev 4547)
@@ -106,7 +106,7 @@
List<ProcessDefinition> existingProcesses = repositorySession.createProcessDefinitionQuery()
.name(processDefinitionName)
- .execute();
+ .list();
for (ProcessDefinition existingProcess: existingProcesses) {
if (!processDefinitionKey.equals(existingProcess.getKey())) {
@@ -116,7 +116,7 @@
existingProcesses = repositorySession.createProcessDefinitionQuery()
.key(processDefinitionKey)
- .execute();
+ .list();
for (ProcessDefinition existingProcess: existingProcesses) {
if (!processDefinitionName.equals(existingProcess.getName())) {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteDeploymentCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteDeploymentCmd.java 2009-04-14 09:11:49 UTC (rev 4546)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeleteDeploymentCmd.java 2009-04-14 09:47:58 UTC (rev 4547)
@@ -57,7 +57,7 @@
RepositorySession repositorySession = environment.get(RepositorySession.class);
List<ProcessDefinition> processDefinitions = repositorySession.createProcessDefinitionQuery()
.deploymentDbid(deploymentDbid)
- .execute();
+ .list();
PvmDbSession pvmDbSession = environment.get(PvmDbSession.class);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java 2009-04-14 09:11:49 UTC (rev 4546)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java 2009-04-14 09:47:58 UTC (rev 4547)
@@ -109,7 +109,7 @@
) {
List<HistoryProcessInstance> historyProcessInstances = new HistoryProcessInstanceQueryImpl(new DefaultCommandService())
.processDefinitionId(processDefinitionId)
- .execute();
+ .list();
for (HistoryProcessInstance historyProcessInstance : historyProcessInstances) {
session.delete(historyProcessInstance);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java 2009-04-14 09:11:49 UTC (rev 4546)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AbstractQuery.java 2009-04-14 09:47:58 UTC (rev 4547)
@@ -26,7 +26,7 @@
import org.hibernate.Query;
import org.hibernate.Session;
-import org.jbpm.ProcessDefinition;
+import org.jbpm.JbpmException;
import org.jbpm.cmd.Command;
import org.jbpm.cmd.CommandService;
import org.jbpm.env.Environment;
@@ -65,13 +65,24 @@
}
*/
- public List execute() {
+ public List untypedList() {
if (commandService!=null) {
return (List) commandService.execute(this);
}
return (List) execute(session);
}
+ protected Object untypedUniqueResult() {
+ List list = untypedList();
+ if (list.isEmpty()) {
+ return null;
+ }
+ if (list.size()>1) {
+ throw new JbpmException("result not unique: "+list.size());
+ }
+ return list.get(0);
+ }
+
public Object execute(Environment environment) throws Exception {
Session session = environment.get(Session.class);
return execute(session);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ExecutionQueryImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ExecutionQueryImpl.java 2009-04-14 09:11:49 UTC (rev 4546)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ExecutionQueryImpl.java 2009-04-14 09:47:58 UTC (rev 4547)
@@ -26,7 +26,6 @@
import org.hibernate.Query;
import org.jbpm.Execution;
import org.jbpm.ExecutionQuery;
-import org.jbpm.JbpmException;
import org.jbpm.cmd.CommandService;
import org.jbpm.pvm.internal.model.ExecutionImpl;
@@ -47,19 +46,12 @@
this.onlyProcessInstances = onlyProcessInstances;
}
- public Execution executeUniqueResult() {
- List<Execution> executions = execute();
- if (executions.isEmpty()) {
- throw new JbpmException("no execution with these criteria");
- }
- if (executions.size()>1) {
- throw new JbpmException("more then 1 execution with these criteria");
- }
- return executions.get(0);
+ public Execution uniqueResult() {
+ return (Execution)untypedUniqueResult();
}
- public List<Execution> execute() {
- return (List<Execution>) commandService.execute(this);
+ public List<Execution> list() {
+ return (List<Execution>) untypedList();
}
public String hql() {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryActivityInstanceQueryImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryActivityInstanceQueryImpl.java 2009-04-14 09:11:49 UTC (rev 4546)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryActivityInstanceQueryImpl.java 2009-04-14 09:47:58 UTC (rev 4547)
@@ -107,9 +107,13 @@
}
}
- public List<HistoryActivityInstance> execute() {
- return (List) commandService.execute(this);
+ public List<HistoryActivityInstance> list() {
+ return (List) untypedList();
}
+
+ public HistoryActivityInstance uniqueResult() {
+ return (HistoryActivityInstance)untypedUniqueResult();
+ }
public HistoryActivityInstanceQuery activityName(String activityName) {
this.activityName = activityName;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryProcessInstanceQueryImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryProcessInstanceQueryImpl.java 2009-04-14 09:11:49 UTC (rev 4546)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryProcessInstanceQueryImpl.java 2009-04-14 09:47:58 UTC (rev 4547)
@@ -24,7 +24,6 @@
import java.util.List;
import org.hibernate.Query;
-import org.jbpm.Execution;
import org.jbpm.JbpmException;
import org.jbpm.cmd.CommandService;
import org.jbpm.history.HistoryProcessInstance;
@@ -72,19 +71,12 @@
protected void applyParameters(Query query) {
}
- public List<HistoryProcessInstance> execute() {
- return (List) commandService.execute(this);
+ public List<HistoryProcessInstance> list() {
+ return (List) untypedList();
}
-
- public HistoryProcessInstance executeUniqueResult() {
- List<HistoryProcessInstance> historyProcessInstances = execute();
- if (historyProcessInstances.isEmpty()) {
- throw new JbpmException("no history process instance with these criteria");
- }
- if (historyProcessInstances.size()>1) {
- throw new JbpmException("more then 1 history process instance with these criteria");
- }
- return historyProcessInstances.get(0);
+
+ public HistoryProcessInstance uniqueResult() {
+ return (HistoryProcessInstance)untypedUniqueResult();
}
public HistoryProcessInstanceQuery processInstanceId(String processInstanceId) {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/JobQueryImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/JobQueryImpl.java 2009-04-14 09:11:49 UTC (rev 4546)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/JobQueryImpl.java 2009-04-14 09:47:58 UTC (rev 4547)
@@ -75,9 +75,13 @@
protected void applyParameters(Query query) {
}
- public List<Job> execute() {
- return (List<Job>) commandService.execute(this);
+ public List<Job> list() {
+ return (List<Job>) untypedList();
}
+
+ public Job uniqueResult() {
+ return (Job)untypedUniqueResult();
+ }
public JobQuery messages() {
this.messagesOnly = true;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessDefinitionQueryImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessDefinitionQueryImpl.java 2009-04-14 09:11:49 UTC (rev 4546)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ProcessDefinitionQueryImpl.java 2009-04-14 09:47:58 UTC (rev 4547)
@@ -27,7 +27,6 @@
import org.hibernate.Query;
import org.hibernate.Session;
-import org.jbpm.JbpmException;
import org.jbpm.ProcessDefinition;
import org.jbpm.ProcessDefinitionQuery;
import org.jbpm.cmd.CommandService;
@@ -57,17 +56,6 @@
super(session);
}
- public ProcessDefinition uniqueResult() {
- List<ProcessDefinition> list = execute();
- if (list.isEmpty()) {
- return null;
- }
- if (list.size()>1) {
- throw new JbpmException("result not unique: "+list.size());
- }
- return list.get(0);
- }
-
public Object execute(Session session) {
List<Map<String, Object>> propertyMaps = (List<Map<String, Object>>) super.execute(session);
@@ -142,6 +130,14 @@
protected void applyParameters(Query query) {
}
+
+ public List<ProcessDefinition> list() {
+ return (List<ProcessDefinition>) untypedList();
+ }
+
+ public ProcessDefinition uniqueResult() {
+ return (ProcessDefinition) untypedUniqueResult();
+ }
public ProcessDefinitionQuery id(String id) {
this.id = id;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java 2009-04-14 09:11:49 UTC (rev 4546)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java 2009-04-14 09:47:58 UTC (rev 4547)
@@ -93,7 +93,7 @@
return createTaskQuery()
.assignee(userId)
.orderDesc(TaskQuery.PROPERTY_PRIORITY)
- .execute();
+ .list();
}
public List<Task> findTakableTasks(String userId)
@@ -101,7 +101,7 @@
return createTaskQuery()
.takableBy(userId)
.orderDesc(TaskQuery.PROPERTY_PRIORITY)
- .execute();
+ .list();
}
public TaskQuery createTaskQuery() {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java 2009-04-14 09:11:49 UTC (rev 4546)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java 2009-04-14 09:47:58 UTC (rev 4547)
@@ -26,6 +26,7 @@
import org.hibernate.Query;
import org.jbpm.JbpmException;
+import org.jbpm.ProcessDefinition;
import org.jbpm.TaskQuery;
import org.jbpm.cmd.CommandService;
import org.jbpm.env.Environment;
@@ -95,10 +96,6 @@
return this;
}
- public List<Task> execute() {
- return (List<Task>) commandService.execute(this);
- }
-
protected void applyParameters(Query query) {
if ((assignee != UNASSIGNED) && (assignee != null)) {
log.debug("setting parameter assignee: "+assignee);
@@ -161,4 +158,12 @@
return hqlQuery;
}
+
+ public List<Task> list() {
+ return (List<Task>) commandService.execute(this);
+ }
+
+ public Task uniqueResult() {
+ return (Task)untypedUniqueResult();
+ }
}
Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-04-14 09:11:49 UTC (rev 4546)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-04-14 09:47:58 UTC (rev 4547)
@@ -293,7 +293,7 @@
.createJobQuery()
.messages()
.processInstanceId(execution.getId())
- .execute();
+ .list();
if (jobs.isEmpty()) {
fail("no async message");
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/EndProcessInstanceTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/EndProcessInstanceTest.java 2009-04-14 09:11:49 UTC (rev 4546)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/EndProcessInstanceTest.java 2009-04-14 09:47:58 UTC (rev 4547)
@@ -52,12 +52,12 @@
List<Execution> executions = executionService.createExecutionQuery()
.processInstanceId(processInstanceId)
- .execute();
+ .list();
assertEquals(0, executions.size());
HistoryProcessInstance historyProcessInstance = historyService.createHistoryProcessInstanceQuery()
.processInstanceId(processInstanceId)
- .executeUniqueResult();
+ .uniqueResult();
assertNotNull(historyProcessInstance.getEndTime());
assertEquals(Execution.STATE_CANCELLED, historyProcessInstance.getState());
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java 2009-04-14 09:11:49 UTC (rev 4546)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java 2009-04-14 09:47:58 UTC (rev 4547)
@@ -52,7 +52,7 @@
.createHistoryProcessInstanceQuery()
.processDefinitionId("ICL-1")
.orderAsc(HistoryProcessInstanceQuery.PROPERTY_STARTTIME)
- .execute();
+ .list();
assertEquals(3, historyProcessInstances.size());
@@ -68,7 +68,7 @@
List<Execution> executions = executionService
.createExecutionQuery()
.processDefinitionId("ICL-1")
- .execute();
+ .list();
assertEquals(0, executions.size());
}
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/ProcessDefinitionQueryTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/ProcessDefinitionQueryTest.java 2009-04-14 09:11:49 UTC (rev 4546)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/ProcessDefinitionQueryTest.java 2009-04-14 09:47:58 UTC (rev 4547)
@@ -36,7 +36,7 @@
public void testQueryProcessDefinitionsEmpty() {
List<ProcessDefinition> processDefinitions = repositoryService
.createProcessDefinitionQuery()
- .execute();
+ .list();
assertEquals(0, processDefinitions.size());
}
@@ -75,7 +75,7 @@
List<ProcessDefinition> processDefinitions = repositoryService.createProcessDefinitionQuery()
.nameLike("%make%")
.orderAsc(ProcessDefinitionQuery.PROPERTY_NAME)
- .execute();
+ .list();
assertEquals("fix coffeemaker", processDefinitions.get(0).getName());
assertEquals("make friends", processDefinitions.get(1).getName());
@@ -128,7 +128,7 @@
List<ProcessDefinition> processDefinitions = repositoryService.createProcessDefinitionQuery()
.nameLike("make%")
.orderAsc(ProcessDefinitionQuery.PROPERTY_ID)
- .execute();
+ .list();
assertEquals("make_friends-1", processDefinitions.get(0).getId());
assertEquals("make_friends-2", processDefinitions.get(1).getId());
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/RepositoryServiceTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/RepositoryServiceTest.java 2009-04-14 09:11:49 UTC (rev 4546)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/RepositoryServiceTest.java 2009-04-14 09:47:58 UTC (rev 4547)
@@ -103,7 +103,7 @@
List<ProcessDefinition> processDefinitions = repositoryService.createProcessDefinitionQuery()
.key("nuclear_fusion")
.orderDesc(ProcessDefinitionQuery.PROPERTY_VERSION)
- .execute();
+ .list();
assertNotNull(processDefinitions);
assertEquals("expected 3 but was " + processDefinitions.size() + ": " + processDefinitions, 3, processDefinitions.size());
@@ -161,7 +161,7 @@
repositoryService.deleteDeployment(deploymentDbid);
// check if the db is empty
- assertEquals(0, repositoryService.createProcessDefinitionQuery().execute().size());
+ assertEquals(0, repositoryService.createProcessDefinitionQuery().list().size());
}
public void testDeleteProcessDefinitionAndInstances() {
@@ -184,8 +184,8 @@
repositoryService.deleteDeploymentCascade(deploymentDbid);
// check if the db is empty
- assertEquals(0, repositoryService.createProcessDefinitionQuery().execute().size());
- assertEquals(0, executionService.createExecutionQuery().execute().size());
+ assertEquals(0, repositoryService.createProcessDefinitionQuery().list().size());
+ assertEquals(0, executionService.createExecutionQuery().list().size());
}
public void testDeleteProcessDefinitionButNotInstances() {
@@ -226,7 +226,7 @@
List<ProcessDefinition> processDefinitions = repositoryService.createProcessDefinitionQuery()
.key("versionme")
.orderDesc(ProcessDefinitionQuery.PROPERTY_VERSION)
- .execute();
+ .list();
assertNotNull(processDefinitions);
// verify that there is only one
@@ -245,7 +245,7 @@
processDefinitions = repositoryService.createProcessDefinitionQuery()
.key("versionme")
.orderDesc(ProcessDefinitionQuery.PROPERTY_VERSION)
- .execute();
+ .list();
// verify that there is only one
assertEquals(processDefinitions.toString(), 2, processDefinitions.size());
@@ -264,7 +264,7 @@
// load it
List<ProcessDefinition> processDefinitions = repositoryService.createProcessDefinitionQuery()
.key("takethis")
- .execute();
+ .list();
assertNotNull(processDefinitions);
assertEquals(processDefinitions.toString(), 1, processDefinitions.size());
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskHandlerTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskHandlerTest.java 2009-04-14 09:11:49 UTC (rev 4546)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskHandlerTest.java 2009-04-14 09:47:58 UTC (rev 4547)
@@ -101,7 +101,7 @@
assertTrue(isExecutionCreateTaskCalled);
- Task task = taskService.createTaskQuery().execute().get(0);
+ Task task = taskService.createTaskQuery().list().get(0);
long taskDbid = task.getDbid();
taskService.setVariable(taskDbid, "checked", "true");
@@ -135,7 +135,7 @@
executionService.startProcessInstanceByKey("TaskHandler");
- Task task = taskService.createTaskQuery().execute().get(0);
+ Task task = taskService.createTaskQuery().list().get(0);
long taskDbid = task.getDbid();
taskService.cancelTask(taskDbid);
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskQueryTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskQueryTest.java 2009-04-14 09:11:49 UTC (rev 4546)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskQueryTest.java 2009-04-14 09:47:58 UTC (rev 4547)
@@ -59,7 +59,7 @@
List<Task> taskList = taskService
.createTaskQuery()
- .execute();
+ .list();
assertNotNull(taskList);
assertContainsTask(taskList, "do laundry");
@@ -97,7 +97,7 @@
List<Task> taskList = taskService
.createTaskQuery()
.orderAsc(TaskQuery.PROPERTY_NAME)
- .execute();
+ .list();
assertNotNull(taskList);
assertEquals("change dyper", taskList.get(0).getName());
More information about the jbpm-commits
mailing list