[jbpm-commits] JBoss JBPM SVN: r3516 - in jbpm3/trunk/modules/core/src: main/resources/org/jbpm/db and 2 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Tue Dec 23 00:23:42 EST 2008


Author: alex.guizar at jboss.com
Date: 2008-12-23 00:23:42 -0500 (Tue, 23 Dec 2008)
New Revision: 3516

Added:
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1921/
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1921/JBPM1921Test.java
Modified:
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/TaskMgmtSession.java
   jbpm3/trunk/modules/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml
Log:
[JBPM-1921] restored distinct task instance selection for pooled actors

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/TaskMgmtSession.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/TaskMgmtSession.java	2008-12-22 20:36:43 UTC (rev 3515)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/TaskMgmtSession.java	2008-12-23 05:23:42 UTC (rev 3516)
@@ -23,6 +23,8 @@
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
 
 import org.apache.commons.logging.Log;
@@ -101,7 +103,17 @@
     try {
       Query query = session.getNamedQuery("TaskMgmtSession.findPooledTaskInstancesByActorId");
       query.setString("swimlaneActorId", actorId);
-      result = query.list();
+      List identifiers = query.list();
+      if (!identifiers.isEmpty()) {
+        result = new ArrayList(identifiers.size());
+        for (Iterator i = identifiers.iterator(); i.hasNext();) {
+          Long taskInstanceId = (Long) i.next();
+          result.add(session.load(TaskInstance.class, taskInstanceId));
+        }
+      }
+      else {
+        result = Collections.EMPTY_LIST;
+      }
     } catch (Exception e) {
       log.error(e);
       jbpmSession.handleException();
@@ -118,7 +130,17 @@
     try {
       Query query = session.getNamedQuery("TaskMgmtSession.findPooledTaskInstancesByActorIds");
       query.setParameterList("actorIds", actorIds);
-      result = query.list();
+      List identifiers = query.list();
+      if (!identifiers.isEmpty()) {
+        result = new ArrayList(identifiers.size());
+        for (Iterator i = identifiers.iterator(); i.hasNext();) {
+          Long taskInstanceId = (Long) i.next();
+          result.add(session.load(TaskInstance.class, taskInstanceId));
+        }
+      }
+      else {
+        result = Collections.EMPTY_LIST;
+      }
     } catch (Exception e) {
       log.error(e);
       jbpmSession.handleException();

Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml
===================================================================
--- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml	2008-12-22 20:36:43 UTC (rev 3515)
+++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml	2008-12-23 05:23:42 UTC (rev 3516)
@@ -374,7 +374,7 @@
 
   <query name="TaskMgmtSession.findPooledTaskInstancesByActorId">
     <![CDATA[
-      select ti
+      select distinct ti.id
       from org.jbpm.taskmgmt.exe.TaskInstance ti
         join ti.pooledActors pooledActor
       where pooledActor.actorId = :swimlaneActorId
@@ -386,7 +386,7 @@
 
   <query name="TaskMgmtSession.findPooledTaskInstancesByActorIds">
     <![CDATA[
-      select ti
+      select distinct ti.id
       from org.jbpm.taskmgmt.exe.TaskInstance ti
         join ti.pooledActors pooledActor
       where pooledActor.actorId in ( :actorIds )

Added: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1921/JBPM1921Test.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1921/JBPM1921Test.java	                        (rev 0)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1921/JBPM1921Test.java	2008-12-23 05:23:42 UTC (rev 3516)
@@ -0,0 +1,86 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.jbpm1921;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.jbpm.db.AbstractDbTestCase;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.exe.ProcessInstance;
+
+/**
+ * Assigning a task to two pooled actors and calling
+ * <code>jbpmContext.getGroupTaskList(List actorIds)</code> with these two actor
+ * ids will get you a list with duplicate task instances.
+ * 
+ * @author Alejandro Guizar
+ */
+public class JBPM1921Test extends AbstractDbTestCase {
+
+  public void testFindByActorId() {
+    ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<?xml version='1.0'?>"
+        + "<process-definition name='" + getName() + "'>"
+        + "  <start-state name='start'>"
+        + "    <transition to='team work'/>"
+        + "  </start-state>"
+        + "  <task-node name='team work'>"
+        + "    <task>"
+        + "      <assignment pooled-actors='ernie,bert,ernie' />"
+        + "    </task>"
+        + "  </task-node>"
+        + "</process-definition>");
+    jbpmContext.deployProcessDefinition(processDefinition);
+    try {
+      ProcessInstance processInstance = jbpmContext.newProcessInstance(processDefinition.getName());
+      processInstance.signal();
+      List pooledTasks = taskMgmtSession.findPooledTaskInstances("ernie");
+      assertEquals(1, pooledTasks.size());
+    } finally {
+      graphSession.deleteProcessDefinition(processDefinition);
+    }
+  }
+
+  public void testFindByActorIds() {
+    ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<?xml version='1.0'?>"
+        + "<process-definition name='" + getName() + "'>"
+        + "  <start-state name='start'>"
+        + "    <transition to='team work'/>"
+        + "  </start-state>"
+        + "  <task-node name='team work'>"
+        + "    <task>"
+        + "      <assignment pooled-actors='ernie,bert,groover' />"
+        + "    </task>"
+        + "  </task-node>"
+        + "</process-definition>");
+    jbpmContext.deployProcessDefinition(processDefinition);
+    try {
+      ProcessInstance processInstance = jbpmContext.newProcessInstance(processDefinition.getName());
+      processInstance.signal();
+      List pooledTasks = jbpmContext.getGroupTaskList(Arrays
+          .asList(new String[] { "ernie", "bert" }));
+      assertEquals(1, pooledTasks.size());
+    } finally {
+      graphSession.deleteProcessDefinition(processDefinition);
+    }
+  }
+}




More information about the jbpm-commits mailing list