[jbpm-commits] JBoss JBPM SVN: r6650 - in jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal: hibernate and 1 other directories.

Author: rebody Date: 2010-09-05 03:15:02 -0400 (Sun, 05 Sep 2010) New Revision: 6650 Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetHistoryVariableNamesCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetParticipantsCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetSubTasksCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/DbSession.java Log: JBPM-2927 move hibernate package from get*cmd to dbSession. Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetHistoryVariableNamesCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetHistoryVariableNamesCmd.java 2010-09-03 04:49:46 UTC (rev 6649) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetHistoryVariableNamesCmd.java 2010-09-05 07:15:02 UTC (rev 6650) @@ -24,43 +24,36 @@ import java.util.HashSet; import java.util.Set; -import org.hibernate.Query; -import org.hibernate.Session; import org.jbpm.api.cmd.Command; import org.jbpm.api.cmd.Environment; import org.jbpm.pvm.internal.history.model.HistoryVariableImpl; +import org.jbpm.pvm.internal.session.DbSession; /** * Command responsible for retrieving variable names stored as history records for given process instance id - * - * + * + * * @author Maciej Swiderski * */ public class GetHistoryVariableNamesCmd implements Command<Set<String>> { - + /** - * + * */ private static final long serialVersionUID = 1L; - + private String processInstanceId; - + public GetHistoryVariableNamesCmd(String processInstanceId) { this.processInstanceId = processInstanceId; } @SuppressWarnings("unchecked") public Set<String> execute(Environment environment) throws Exception { - Session dbsession = environment.get(Session.class); - - String hql =! "select hv.variableName from " + HistoryVariableImpl.class.getName() + " hv where hv.processInstanceId = '" + processInstanceId + "'"; - - Query query = dbsession.createQuery(hql); - - Set<String> historyVariables = new HashSet<String>(query.list()); - - return historyVariables; + DbSession dbSession = environment.get(DbSession.class); + + return dbSession.findHistoryVariableNames(processInstanceId); } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetParticipantsCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetParticipantsCmd.java 2010-09-03 04:49:46 UTC (rev 6649) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetParticipantsCmd.java 2010-09-05 07:15:02 UTC (rev 6650) @@ -23,13 +23,10 @@ import java.util.List; -import org.hibernate.Criteria; -import org.hibernate.Session; -import org.hibernate.criterion.Restrictions; - import org.jbpm.api.JbpmException; import org.jbpm.api.cmd.Environment; import org.jbpm.api.task.Participation; +import org.jbpm.pvm.internal.session.DbSession; import org.jbpm.pvm.internal.task.ParticipationImpl; import org.jbpm.pvm.internal.util.CollectionUtil; @@ -37,14 +34,14 @@ * @author Tom Baeyens */ public class GetParticipantsCmd extends AbstractCommand<List<Participation>> { - + private static final long serialVersionUID = 1L; protected String taskId; protected String swimlaneId; - + public GetParticipantsCmd(String taskId, String swimlaneId) { - if (taskId==null) { + if (taskId == null) { throw new JbpmException("taskId is null"); } this.taskId = taskId; @@ -52,17 +49,7 @@ } public List<Participation> execute(Environment environment) throws Exception { - Criteria criteria = environment.get(Session.class).createCriteria(ParticipationImpl.class); - - if (taskId!=null) { - criteria.add(Restrictions.eq("task.dbid", Long.parseLong(taskId))); - } else if (swimlaneId!=null) { - criteria.add(Restrictions.eq("swimlane.dbid", Long.parseLong(swimlaneId))); - } else { - throw new JbpmException("no task nor swimlane specified"); - } - - List<?> participations = criteria.list(); - return CollectionUtil.checkList(participations, Participation.class); + DbSession dbSession = environment.get(DbSession.class); + return dbSession.findParticipants(taskId, swimlaneId); } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetSubTasksCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetSubTasksCmd.java 2010-09-03 04:49:46 UTC (rev 6649) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetSubTasksCmd.java 2010-09-05 07:15:02 UTC (rev 6650) @@ -23,11 +23,9 @@ import java.util.List; -import org.hibernate.Session; -import org.hibernate.criterion.Restrictions; - import org.jbpm.api.cmd.Environment; import org.jbpm.api.task.Task; +import org.jbpm.pvm.internal.session.DbSession; import org.jbpm.pvm.internal.task.TaskImpl; import org.jbpm.pvm.internal.util.CollectionUtil; @@ -35,20 +33,17 @@ * @author Tom Baeyens */ public class GetSubTasksCmd extends AbstractCommand<List<Task>> { - + private static final long serialVersionUID = 1L; String parentTaskId; - + public GetSubTasksCmd(String parentTaskId) { this.parentTaskId = parentTaskId; } public List<Task> execute(Environment environment) throws Exception { - List<?> tasks = environment.get(Session.class).createCriteria(TaskImpl.class) - .createAlias("superTask", "super") - .add(Restrictions.eq("super.dbid", Long.parseLong(parentTaskId))) - .list(); - return CollectionUtil.checkList(tasks, Task.class); + DbSession dbSession = environment.get(DbSession.class); + return dbSession.findSubTasks(parentTaskId); } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java 2010-09-03 04:49:46 UTC (rev 6649) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java 2010-09-05 07:15:02 UTC (rev 6650) @@ -24,9 +24,13 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; +import java.util.HashSet; import java.util.List; +import java.util.Set; +import org.hibernate.Criteria; import org.hibernate.LockMode; +import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; @@ -36,6 +40,7 @@ import org.jbpm.api.JbpmException; import org.jbpm.api.job.Timer; import org.jbpm.api.history.HistoryComment; +import org.jbpm.api.task.Participation; import org.jbpm.api.task.Task; import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.client.ClientExecution; @@ -530,4 +535,37 @@ } } } + + /** query. */ + public Set<String> findHistoryVariableNames(String processInstanceId) { + String hql = "select hv.variableName from " + HistoryVariableImpl.class.getName() + " hv where hv.processInstanceId = '" + processInstanceId + "'"; + + Query query = session.createQuery(hql); + Set<String> historyVariables = new HashSet<String>(query.list()); + + return historyVariables; + } + + public List<Participation> findParticipants(String taskId, String swimlaneId) { + Criteria criteria = session.createCriteria(ParticipationImpl.class); + + if (taskId != null) { + criteria.add(Restrictions.eq("task.dbid", Long.parseLong(taskId))); + } else if (swimlaneId != null) { + criteria.add(Restrictions.eq("swimlane.dbid", Long.parseLong(swimlaneId))); + } else { + throw new JbpmException("no task nor swimlane specified"); + } + + List<?> participations = criteria.list(); + return CollectionUtil.checkList(participations, Participation.class); + } + + public List<Task> findSubTasks(String parentTaskId) { + List<?> tasks = session.createCriteria(TaskImpl.class) + .createAlias("superTask", "super") + .add(Restrictions.eq("super.dbid", Long.parseLong(parentTaskId))) + .list(); + return CollectionUtil.checkList(tasks, Task.class); + } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/DbSession.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/DbSession.java 2010-09-03 04:49:46 UTC (rev 6649) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/DbSession.java 2010-09-05 07:15:02 UTC (rev 6650) @@ -22,10 +22,13 @@ package org.jbpm.pvm.internal.session; import java.util.List; +import java.util.Set; import org.jbpm.api.Execution; import org.jbpm.api.job.Timer; import org.jbpm.api.history.HistoryComment; +import org.jbpm.api.task.Participation; +import org.jbpm.api.task.Task; import org.jbpm.pvm.internal.client.ClientExecution; import org.jbpm.pvm.internal.job.JobImpl; import org.jbpm.pvm.internal.job.StartProcessTimer; @@ -121,4 +124,9 @@ Long initializeNextId(long blocksize); void initializeSchemaVersion(); Long getMaxDbid(); + + /** query. */ + Set<String> findHistoryVariableNames(String processInstanceId); + List<Participation> findParticipants(String taskId, String swimlaneId); + List<Task> findSubTasks(String parentTaskId); }