JBPM-4658 - RuntimeDataService getProcessById incorrectly returns sin…

…gle ProcessDefinition while it should return list
kiegroup · May 20, 2015 · 33a7e88 · 33a7e88
1 parent 848348f
commit 33a7e88
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 21 deletions.
diff --git a/...es/jbpm-kie-services/src/main/java/org/jbpm/kie/services/impl/RuntimeDataServiceImpl.java b/...es/jbpm-kie-services/src/main/java/org/jbpm/kie/services/impl/RuntimeDataServiceImpl.java
@@ -286,15 +286,25 @@ public Collection<ProcessDefinition> getProcessesByFilter(String filter, QueryCo
         applySorting(outputCollection, queryContext);
         return applyPaginition(outputCollection, queryContext);
     }
-
+
+    @Deprecated
     public ProcessDefinition getProcessById(String processId){
 
-        Collection<ProcessAssetDesc> outputCollection = new HashSet<ProcessAssetDesc>();
-        CollectionUtils.select(availableProcesses, new ByProcessIdPredicate(processId, identityProvider.getRoles()), outputCollection);
-        if (!outputCollection.isEmpty()) {
-            return outputCollection.iterator().next();
+        Collection<ProcessDefinition> definitions = getProcessesById(processId);
+        if (!definitions.isEmpty()) {
+            return definitions.iterator().next();
         }
-        return null;   
+
+        return null;
+    }
+
+
+    public Collection<ProcessDefinition> getProcessesById(String processId){
+
+        Collection<ProcessDefinition> outputCollection = new HashSet<ProcessDefinition>();
+        CollectionUtils.select(availableProcesses, new ByProcessIdPredicate(processId, identityProvider.getRoles()), outputCollection);
+
+        return outputCollection;   
     }
 
     public Collection<ProcessDefinition> getProcesses(QueryContext queryContext) {

diff --git a/...ces/jbpm-kie-services/src/test/java/org/jbpm/kie/services/test/DeploymentServiceTest.java b/...ces/jbpm-kie-services/src/test/java/org/jbpm/kie/services/test/DeploymentServiceTest.java
@@ -158,7 +158,7 @@ public void testDeploymentOfProcesses() {
         assertNotNull(processes);
         assertEquals(5, processes.size());
 
-        ProcessDefinition process = runtimeDataService.getProcessById("customtask");
+        ProcessDefinition process = runtimeDataService.getProcessesByDeploymentIdProcessId(deploymentUnit.getIdentifier(), "customtask");
         assertNotNull(process);
 
         RuntimeManager manager = deploymentService.getRuntimeManager(deploymentUnit.getIdentifier());

diff --git a/...rvices/src/test/java/org/jbpm/kie/services/test/FilteredKModuleDeploymentServiceTest.java b/...rvices/src/test/java/org/jbpm/kie/services/test/FilteredKModuleDeploymentServiceTest.java
@@ -125,7 +125,7 @@ public void testDeploymentOfProcessesFromCustomerPackageDeafultKBase() {
         assertNotNull(processes);
         assertEquals(2, processes.size());
 
-        ProcessDefinition process = runtimeDataService.getProcessById("customtask");
+        ProcessDefinition process = runtimeDataService.getProcessesByDeploymentIdProcessId(deploymentUnit.getIdentifier(), "customtask");
         assertNotNull(process);
 
     }
@@ -160,7 +160,7 @@ public void testDeploymentOfProcessesFromCustomerPackage() {
         assertNotNull(processes);
         assertEquals(2, processes.size());
 
-        ProcessDefinition process = runtimeDataService.getProcessById("customtask");
+        ProcessDefinition process = runtimeDataService.getProcessesByDeploymentIdProcessId(deploymentUnit.getIdentifier(), "customtask");
         assertNotNull(process);
 
     }
@@ -191,7 +191,7 @@ public void testDeploymentOfProcessesFromOrderPackage() {
         assertNotNull(processes);
         assertEquals(1, processes.size());
 
-        ProcessDefinition process = runtimeDataService.getProcessById("Import");
+        ProcessDefinition process = runtimeDataService.getProcessesByDeploymentIdProcessId(deploymentUnit.getIdentifier(), "Import");
         assertNotNull(process);
 
     }
@@ -226,7 +226,7 @@ public void testDeploymentOfProcessesWildcardPackage() {
         assertNotNull(processes);
         assertEquals(2, processes.size());
 
-        ProcessDefinition process = runtimeDataService.getProcessById("customtask");
+        ProcessDefinition process = runtimeDataService.getProcessesByDeploymentIdProcessId(deploymentUnit.getIdentifier(), "customtask");
         assertNotNull(process);
 
     }

diff --git a/...m-kie-services/src/test/java/org/jbpm/kie/services/test/KModuleDeploymentServiceTest.java b/...m-kie-services/src/test/java/org/jbpm/kie/services/test/KModuleDeploymentServiceTest.java
@@ -135,7 +135,7 @@ public void testDeploymentOfProcesses() {
         assertNotNull(processes);
         assertEquals(3, processes.size());
 
-        ProcessDefinition process = runtimeDataService.getProcessById("customtask");
+        ProcessDefinition process = runtimeDataService.getProcessesByDeploymentIdProcessId(deploymentUnit.getIdentifier(), "customtask");
         assertNotNull(process);
 
         RuntimeManager manager = deploymentService.getRuntimeManager(deploymentUnit.getIdentifier());
@@ -183,7 +183,7 @@ public void testDeploymentOfProcessesOnDefaultKbaseAndKsession() {
         assertNotNull(processes);
         assertEquals(3, processes.size());
 
-        ProcessDefinition process = runtimeDataService.getProcessById("customtask");
+        ProcessDefinition process = runtimeDataService.getProcessesByDeploymentIdProcessId(deploymentUnit.getIdentifier(), "customtask");
         assertNotNull(process);
 
         RuntimeManager manager = deploymentService.getRuntimeManager(deploymentUnit.getIdentifier());

diff --git a/...jbpm-kie-services/src/test/java/org/jbpm/kie/services/test/PostDeploymentServiceTest.java b/...jbpm-kie-services/src/test/java/org/jbpm/kie/services/test/PostDeploymentServiceTest.java
@@ -125,7 +125,7 @@ public void testDeploymentOfProcesses() {
         assertNotNull(processes);
         assertEquals(5, processes.size());
 
-        ProcessDefinition process = runtimeDataService.getProcessById("customtask");
+        ProcessDefinition process = runtimeDataService.getProcessesByDeploymentIdProcessId(deploymentUnit.getIdentifier(), "customtask");
         assertNotNull(process);
 
         RuntimeManager manager = deploymentService.getRuntimeManager(deploymentUnit.getIdentifier());

diff --git a/...bpm-kie-services/src/test/java/org/jbpm/kie/services/test/RuntimeDataServiceImplTest.java b/...bpm-kie-services/src/test/java/org/jbpm/kie/services/test/RuntimeDataServiceImplTest.java
@@ -178,10 +178,11 @@ public void testGetProcessByFilter() {
 
     @Test
     public void testGetProcessByProcessId() {
-    	ProcessDefinition definition = runtimeDataService.getProcessById("org.jbpm.writedocument");
+    	Collection<ProcessDefinition> definition = runtimeDataService.getProcessesById("org.jbpm.writedocument");
 
     	assertNotNull(definition);
-    	assertEquals("org.jbpm.writedocument", definition.getId());
+    	assertEquals(1, definition.size());
+    	assertEquals("org.jbpm.writedocument", definition.iterator().next().getId());
     }
 
     @Test

diff --git a/jbpm-services/jbpm-services-api/src/main/java/org/jbpm/services/api/RuntimeDataService.java b/jbpm-services/jbpm-services-api/src/main/java/org/jbpm/services/api/RuntimeDataService.java
@@ -256,12 +256,27 @@ public int getValue() {
     Collection<String> getProcessIds(String deploymentId, QueryContext queryContext);
 
     /**
+     * Deprecated since 6.3 as it does return only first ProcessDefinition even if there are more
+     * that reside in different deployments. Use <code>getProcessesById(String processId)</code> instead
+     * <br/>
      * Returns process definition for given process id 
      * @param processId The id of the process
      * @return A {@link ProcessAssetDesc} instance, representing the {@link Process} 
      *         with the specified (process) id. 
+     * 
+     * @see RuntimeDataService#getProcessesById(String)
+     * @deprecated will be removed in version 7
      */
+    @Deprecated    
     ProcessDefinition getProcessById(String processId);
+
+    /**
+     * Returns process definitions for given process id regardless of the deployment
+     * @param processId The id of the process
+     * @return A {@link ProcessAssetDesc} instance, representing the {@link Process} 
+     *         with the specified (process) id. 
+     */
+    Collection<ProcessDefinition> getProcessesById(String processId);
 
     /**
      * Returns process definition for given deployment and process identifiers

diff --git a/...jb-impl/src/test/java/org/jbpm/services/ejb/test/DeploymentServiceEJBIntegrationTest.java b/...jb-impl/src/test/java/org/jbpm/services/ejb/test/DeploymentServiceEJBIntegrationTest.java
@@ -182,7 +182,7 @@ public void testDeploymentOfProcesses() {
         assertNotNull(processes);
         assertEquals(5, processes.size());
 
-        ProcessDefinition process = runtimeDataService.getProcessById("customtask");
+        ProcessDefinition process = runtimeDataService.getProcessesByDeploymentIdProcessId(deploymentUnit.getIdentifier(), "customtask");
         assertNotNull(process);
 
         RuntimeManager manager = deploymentService.getRuntimeManager(deploymentUnit.getIdentifier());

diff --git a/...b-impl/src/test/java/org/jbpm/services/ejb/test/RuntimeDataServiceEJBIntegrationTest.java b/...b-impl/src/test/java/org/jbpm/services/ejb/test/RuntimeDataServiceEJBIntegrationTest.java
@@ -209,10 +209,11 @@ public void testGetProcessByFilter() {
 
     @Test
     public void testGetProcessByProcessId() {
-    	ProcessDefinition definition = runtimeDataService.getProcessById("org.jbpm.writedocument");
-
-    	assertNotNull(definition);
-    	assertEquals("org.jbpm.writedocument", definition.getId());
+        Collection<ProcessDefinition> definition = runtimeDataService.getProcessesById("org.jbpm.writedocument");
+
+        assertNotNull(definition);
+        assertEquals(1, definition.size());
+        assertEquals("org.jbpm.writedocument", definition.iterator().next().getId());
     }
 
     @Test