diff --git a/imixs-workflow-engine/src/main/java/org/imixs/workflow/engine/plugins/SplitAndJoinPlugin.java b/imixs-workflow-engine/src/main/java/org/imixs/workflow/engine/plugins/SplitAndJoinPlugin.java index 0868c0d5a..ed70fdad6 100644 --- a/imixs-workflow-engine/src/main/java/org/imixs/workflow/engine/plugins/SplitAndJoinPlugin.java +++ b/imixs-workflow-engine/src/main/java/org/imixs/workflow/engine/plugins/SplitAndJoinPlugin.java @@ -287,7 +287,7 @@ protected void updateSubprocesses(final List subProcessDefinitions, fina // test if process matches String subModelVersion = workitemSubProcess.getModelVersion(); - String subProcessID = "" + workitemSubProcess.getProcessID(); + String subProcessID = "" + workitemSubProcess.getTaskID(); if (Pattern.compile(model_pattern).matcher(subModelVersion).find() && Pattern.compile(process_pattern).matcher(subProcessID).find()) { @@ -380,7 +380,7 @@ protected void updateOrigin(final String originProcessDefinition, final ItemColl // test if process matches String subModelVersion = originWorkitem.getModelVersion(); - String subProcessID = "" + originWorkitem.getProcessID(); + String subProcessID = "" + originWorkitem.getTaskID(); if (Pattern.compile(model_pattern).matcher(subModelVersion).find() && Pattern.compile(process_pattern).matcher(subProcessID).find()) { diff --git a/imixs-workflow-engine/src/test/java/org/imixs/workflow/plugins/TestSplitAndJoinPlugin.java b/imixs-workflow-engine/src/test/java/org/imixs/workflow/plugins/TestSplitAndJoinPlugin.java index e1c22be6a..8028504b7 100644 --- a/imixs-workflow-engine/src/test/java/org/imixs/workflow/plugins/TestSplitAndJoinPlugin.java +++ b/imixs-workflow-engine/src/test/java/org/imixs/workflow/plugins/TestSplitAndJoinPlugin.java @@ -109,7 +109,7 @@ public void testCreateSubProcess() throws ModelException { Assert.assertEquals("/pages/workitems/workitem.jsf?id=" + subprocessUniqueid, documentContext.getItemValueString("action")); - Assert.assertEquals(100, subprocess.getProcessID()); + Assert.assertEquals(100, subprocess.getTaskID()); logger.info("Created Subprocess UniqueID=" + subprocess.getUniqueID()); @@ -153,7 +153,7 @@ public void testCreateSubProcessTargetFieldName() throws ModelException { // test data in subprocess Assert.assertNotNull(subprocess); - Assert.assertEquals(100, subprocess.getProcessID()); + Assert.assertEquals(100, subprocess.getTaskID()); logger.info("Created Subprocess UniqueID=" + subprocess.getUniqueID()); @@ -195,14 +195,14 @@ public void testCreateMultiSubProcess() throws ModelException { String subprocessUniqueid = workitemRefList.get(0); ItemCollection subprocess = workflowMockEnvironment.getDocumentService().load(subprocessUniqueid); Assert.assertNotNull(subprocess); - Assert.assertEquals(100, subprocess.getProcessID()); + Assert.assertEquals(100, subprocess.getTaskID()); logger.info("Created Subprocess UniqueID=" + subprocess.getUniqueID()); // test second subprocess instance... 100.20 -> $processId=200 subprocessUniqueid = workitemRefList.get(1); subprocess = workflowMockEnvironment.getDocumentService().load(subprocessUniqueid); Assert.assertNotNull(subprocess); - Assert.assertEquals(100, subprocess.getProcessID()); + Assert.assertEquals(100, subprocess.getTaskID()); logger.info("Created Subprocess UniqueID=" + subprocess.getUniqueID()); } @@ -265,7 +265,7 @@ public void testUpdateOriginProcess() throws ModelException { // test data in subprocess Assert.assertNotNull(subprocess); - Assert.assertEquals(100, subprocess.getProcessID()); + Assert.assertEquals(100, subprocess.getTaskID()); /* * 2.) process the subprocess to test if the origin process will be updated @@ -291,7 +291,7 @@ public void testUpdateOriginProcess() throws ModelException { Assert.assertNotNull(documentContext); // test data.... (new $processId=200 and _sub_data from subprocess - Assert.assertEquals(100, documentContext.getProcessID()); + Assert.assertEquals(100, documentContext.getTaskID()); Assert.assertEquals("some test data", documentContext.getItemValueString("_sub_data")); } @@ -323,7 +323,7 @@ public void testUpdateSubProcess() throws ModelException { String subprocessUniqueid = workitemRefList.get(0); ItemCollection subprocess = workflowMockEnvironment.getDocumentService().load(subprocessUniqueid); Assert.assertNotNull(subprocess); - Assert.assertEquals(100, subprocess.getProcessID()); + Assert.assertEquals(100, subprocess.getTaskID()); // 2.) now update the subprocess try { @@ -344,7 +344,7 @@ public void testUpdateSubProcess() throws ModelException { subprocess = workflowMockEnvironment.getDocumentService().load(subprocessUniqueid); Assert.assertNotNull(subprocess); - Assert.assertEquals(100, subprocess.getProcessID()); + Assert.assertEquals(100, subprocess.getTaskID()); Assert.assertEquals("Walter", subprocess.getItemValueString("namTEAM")); }