[jboss-svn-commits] JBL Code SVN: r27264 - in labs/jbossrules/trunk: drools-core/src/main/java/org/drools/workflow/core/node and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Jun 28 19:52:43 EDT 2009
Author: KrisVerlaenen
Date: 2009-06-28 19:52:43 -0400 (Sun, 28 Jun 2009)
New Revision: 27264
Modified:
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessUpgradeTest.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/node/Split.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/WorkflowProcessInstanceUpgrader.java
Log:
JBRULES-2146: Improved process instance migration
- added support for new api
- supporting composite nodes
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessUpgradeTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessUpgradeTest.java 2009-06-28 23:07:51 UTC (rev 27263)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessUpgradeTest.java 2009-06-28 23:52:43 UTC (rev 27264)
@@ -4,22 +4,30 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import junit.framework.TestCase;
+import org.drools.KnowledgeBase;
+import org.drools.KnowledgeBaseFactory;
import org.drools.Person;
import org.drools.RuleBase;
import org.drools.RuleBaseConfiguration;
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
+import org.drools.builder.KnowledgeBuilder;
+import org.drools.builder.KnowledgeBuilderFactory;
+import org.drools.builder.ResourceType;
import org.drools.compiler.PackageBuilder;
+import org.drools.io.impl.ByteArrayResource;
import org.drools.process.instance.ProcessInstance;
import org.drools.rule.Package;
+import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.workflow.instance.WorkflowProcessInstanceUpgrader;
public class ProcessUpgradeTest extends TestCase {
- public void testUpgrade() throws Exception {
+ public void testDefaultUpgrade() throws Exception {
String rule = "package org.test;\n";
rule += "import org.drools.Person\n";
rule += "global java.util.List list\n";
@@ -62,7 +70,7 @@
StatefulSession session = ruleBase.newStatefulSession();
- List list = new ArrayList();
+ List<String> list = new ArrayList<String>();
session.setGlobal( "list", list );
Person p = new Person( "bobba fet", 32);
@@ -103,7 +111,7 @@
ruleBase.addPackage(pkg);
WorkflowProcessInstanceUpgrader.upgradeProcessInstance(
- session, processInstance.getId(), "org.test.ruleflow2", new HashMap<Long, Long>());
+ session, processInstance.getId(), "org.test.ruleflow2", new HashMap<String, Long>());
assertEquals("org.test.ruleflow2", processInstance.getProcessId());
session.fireAllRules();
@@ -112,4 +120,308 @@
assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
}
+ public void testMappingUpgrade() throws Exception {
+ String rule = "package org.test;\n";
+ rule += "import org.drools.Person\n";
+ rule += "global java.util.List list\n";
+ rule += "rule \"Rule 1\"\n";
+ rule += " ruleflow-group \"hello\"\n";
+ rule += "when\n";
+ rule += " $p : Person( ) \n";
+ rule += "then\n";
+ rule += " list.add( $p );\n";
+ rule += "end";
+
+ PackageBuilder builder = new PackageBuilder();
+ builder.addPackageFromDrl( new StringReader( rule ));
+
+ String process =
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "<process xmlns=\"http://drools.org/drools-5.0/process\"\n" +
+ " xmlns:xs=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+ " xs:schemaLocation=\"http://drools.org/drools-5.0/process drools-processes-5.0.xsd\"\n" +
+ " type=\"RuleFlow\" name=\"ruleflow\" id=\"org.test.ruleflow\" package-name=\"org.test\" >\n" +
+ " <header>\n" +
+ " </header>\n" +
+ " <nodes>\n" +
+ " <start id=\"1\" name=\"Start\" />\n" +
+ " <ruleSet id=\"2\" name=\"Hello\" ruleFlowGroup=\"hello\" />\n" +
+ " <end id=\"3\" name=\"End\" />\n" +
+ " </nodes>\n" +
+ " <connections>\n" +
+ " <connection from=\"1\" to=\"2\"/>\n" +
+ " <connection from=\"2\" to=\"3\"/>\n" +
+ " </connections>\n" +
+ "</process>";
+ builder.addProcessFromXml( new StringReader( process ));
+ Package pkg = builder.getPackage();
+
+ RuleBaseConfiguration config = new RuleBaseConfiguration();
+ config.setRuleBaseUpdateHandler(null);
+ final RuleBase ruleBase = RuleBaseFactory.newRuleBase(config);
+ ruleBase.addPackage(pkg);
+
+ StatefulSession session = ruleBase.newStatefulSession();
+
+ List<String> list = new ArrayList<String>();
+ session.setGlobal( "list", list );
+
+ Person p = new Person( "bobba fet", 32);
+ session.insert( p );
+ ProcessInstance processInstance = ( ProcessInstance ) session.startProcess("org.test.ruleflow");
+
+ assertEquals(1, session.getProcessInstances().size());
+
+ String process2 =
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "<process xmlns=\"http://drools.org/drools-5.0/process\"\n" +
+ " xmlns:xs=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+ " xs:schemaLocation=\"http://drools.org/drools-5.0/process drools-processes-5.0.xsd\"\n" +
+ " type=\"RuleFlow\" name=\"ruleflow\" id=\"org.test.ruleflow2\" package-name=\"org.test\" >\n" +
+ " <header>\n" +
+ " <globals>\n" +
+ " <global identifier=\"list\" type=\"java.util.List\" />\n" +
+ " </globals>\n" +
+ " </header>\n" +
+ " <nodes>\n" +
+ " <start id=\"1\" name=\"Start\" />\n" +
+ " <ruleSet id=\"102\" name=\"Hello\" ruleFlowGroup=\"hello\" />\n" +
+ " <actionNode id=\"4\" name=\"Action\" >" +
+ " <action type=\"expression\" dialect=\"java\">System.out.println();\n" +
+ "list.add(\"Executed\");</action>\n" +
+ " </actionNode>\n" +
+ " <end id=\"3\" name=\"End\" />\n" +
+ " </nodes>\n" +
+ " <connections>\n" +
+ " <connection from=\"1\" to=\"102\"/>\n" +
+ " <connection from=\"102\" to=\"4\"/>\n" +
+ " <connection from=\"4\" to=\"3\"/>\n" +
+ " </connections>\n" +
+ "</process>";
+ builder = new PackageBuilder();
+ builder.addProcessFromXml( new StringReader( process2 ));
+ pkg = builder.getPackage();
+ ruleBase.addPackage(pkg);
+
+ Map<String, Long> mapping = new HashMap<String, Long>();
+ mapping.put("2", 102L);
+
+ WorkflowProcessInstanceUpgrader.upgradeProcessInstance(
+ session, processInstance.getId(), "org.test.ruleflow2", mapping);
+ assertEquals("org.test.ruleflow2", processInstance.getProcessId());
+
+ session.fireAllRules();
+
+ assertEquals(2, list.size());
+ assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
+ }
+
+ public void testCompositeMappingUpgrade() throws Exception {
+ String rule = "package org.test;\n";
+ rule += "import org.drools.Person\n";
+ rule += "global java.util.List list\n";
+ rule += "rule \"Rule 1\"\n";
+ rule += " ruleflow-group \"hello\"\n";
+ rule += "when\n";
+ rule += " $p : Person( ) \n";
+ rule += "then\n";
+ rule += " list.add( $p );\n";
+ rule += "end";
+
+ PackageBuilder builder = new PackageBuilder();
+ builder.addPackageFromDrl( new StringReader( rule ));
+
+ String process =
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "<process xmlns=\"http://drools.org/drools-5.0/process\"\n" +
+ " xmlns:xs=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+ " xs:schemaLocation=\"http://drools.org/drools-5.0/process drools-processes-5.0.xsd\"\n" +
+ " type=\"RuleFlow\" name=\"ruleflow\" id=\"org.test.ruleflow\" package-name=\"org.test\" >\n" +
+ " <header>\n" +
+ " </header>\n" +
+ " <nodes>\n" +
+ " <start id=\"1\" name=\"Start\" />\n" +
+ " <composite id=\"2\" name=\"Composite\" >\n" +
+ " <nodes>\n" +
+ " <ruleSet id=\"1\" name=\"Hello\" ruleFlowGroup=\"hello\" />\n" +
+ " </nodes>\n" +
+ " <connections>\n" +
+ " </connections>\n" +
+ " <in-ports>\n" +
+ " <in-port type=\"DROOLS_DEFAULT\" nodeId=\"1\" nodeInType=\"DROOLS_DEFAULT\" />\n" +
+ " </in-ports>\n" +
+ " <out-ports>\n" +
+ " <out-port type=\"DROOLS_DEFAULT\" nodeId=\"1\" nodeOutType=\"DROOLS_DEFAULT\" />\n" +
+ " </out-ports>\n" +
+ " </composite>\n" +
+ " <end id=\"3\" name=\"End\" />\n" +
+ " </nodes>\n" +
+ " <connections>\n" +
+ " <connection from=\"1\" to=\"2\"/>\n" +
+ " <connection from=\"2\" to=\"3\"/>\n" +
+ " </connections>\n" +
+ "</process>";
+ builder.addProcessFromXml( new StringReader( process ));
+ Package pkg = builder.getPackage();
+
+ RuleBaseConfiguration config = new RuleBaseConfiguration();
+ config.setRuleBaseUpdateHandler(null);
+ final RuleBase ruleBase = RuleBaseFactory.newRuleBase(config);
+ ruleBase.addPackage(pkg);
+
+ StatefulSession session = ruleBase.newStatefulSession();
+
+ List<String> list = new ArrayList<String>();
+ session.setGlobal( "list", list );
+
+ Person p = new Person( "bobba fet", 32);
+ session.insert( p );
+ ProcessInstance processInstance = ( ProcessInstance ) session.startProcess("org.test.ruleflow");
+
+ assertEquals(1, session.getProcessInstances().size());
+
+ String process2 =
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "<process xmlns=\"http://drools.org/drools-5.0/process\"\n" +
+ " xmlns:xs=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+ " xs:schemaLocation=\"http://drools.org/drools-5.0/process drools-processes-5.0.xsd\"\n" +
+ " type=\"RuleFlow\" name=\"ruleflow\" id=\"org.test.ruleflow2\" package-name=\"org.test\" >\n" +
+ " <header>\n" +
+ " <globals>\n" +
+ " <global identifier=\"list\" type=\"java.util.List\" />\n" +
+ " </globals>\n" +
+ " </header>\n" +
+ " <nodes>\n" +
+ " <start id=\"1\" name=\"Start\" />\n" +
+ " <composite id=\"2\" name=\"Composite\" >\n" +
+ " <nodes>\n" +
+ " <ruleSet id=\"101\" name=\"Hello\" ruleFlowGroup=\"hello\" />\n" +
+ " <actionNode id=\"2\" name=\"Action\" >" +
+ " <action type=\"expression\" dialect=\"java\">System.out.println();\n" +
+ "list.add(\"Executed\");</action>\n" +
+ " </actionNode>\n" +
+ " </nodes>\n" +
+ " <connections>\n" +
+ " <connection from=\"101\" to=\"2\"/>\n" +
+ " </connections>\n" +
+ " <in-ports>\n" +
+ " <in-port type=\"DROOLS_DEFAULT\" nodeId=\"101\" nodeInType=\"DROOLS_DEFAULT\" />\n" +
+ " </in-ports>\n" +
+ " <out-ports>\n" +
+ " <out-port type=\"DROOLS_DEFAULT\" nodeId=\"2\" nodeOutType=\"DROOLS_DEFAULT\" />\n" +
+ " </out-ports>\n" +
+ " </composite>\n" +
+ " <end id=\"3\" name=\"End\" />\n" +
+ " </nodes>\n" +
+ " <connections>\n" +
+ " <connection from=\"1\" to=\"2\"/>\n" +
+ " <connection from=\"2\" to=\"3\"/>\n" +
+ " </connections>\n" +
+ "</process>";
+ builder = new PackageBuilder();
+ builder.addProcessFromXml( new StringReader( process2 ));
+ pkg = builder.getPackage();
+ ruleBase.addPackage(pkg);
+
+ Map<String, Long> mapping = new HashMap<String, Long>();
+ mapping.put("2:1", 101L);
+
+ WorkflowProcessInstanceUpgrader.upgradeProcessInstance(
+ session, processInstance.getId(), "org.test.ruleflow2", mapping);
+ assertEquals("org.test.ruleflow2", processInstance.getProcessId());
+
+ session.fireAllRules();
+
+ assertEquals(2, list.size());
+ assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
+ }
+
+ public void testDefaultUpgrade2() throws Exception {
+ String rule = "package org.test;\n";
+ rule += "import org.drools.Person\n";
+ rule += "global java.util.List list\n";
+ rule += "rule \"Rule 1\"\n";
+ rule += " ruleflow-group \"hello\"\n";
+ rule += "when\n";
+ rule += " $p : Person( ) \n";
+ rule += "then\n";
+ rule += " list.add( $p );\n";
+ rule += "end";
+
+ KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();
+ kbuilder.add(new ByteArrayResource(rule.getBytes()), ResourceType.DRL);
+
+ String process =
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "<process xmlns=\"http://drools.org/drools-5.0/process\"\n" +
+ " xmlns:xs=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+ " xs:schemaLocation=\"http://drools.org/drools-5.0/process drools-processes-5.0.xsd\"\n" +
+ " type=\"RuleFlow\" name=\"ruleflow\" id=\"org.test.ruleflow\" package-name=\"org.test\" >\n" +
+ " <header>\n" +
+ " </header>\n" +
+ " <nodes>\n" +
+ " <start id=\"1\" name=\"Start\" />\n" +
+ " <ruleSet id=\"2\" name=\"Hello\" ruleFlowGroup=\"hello\" />\n" +
+ " <end id=\"3\" name=\"End\" />\n" +
+ " </nodes>\n" +
+ " <connections>\n" +
+ " <connection from=\"1\" to=\"2\"/>\n" +
+ " <connection from=\"2\" to=\"3\"/>\n" +
+ " </connections>\n" +
+ "</process>";
+ kbuilder.add(new ByteArrayResource(process.getBytes()), ResourceType.DRF);
+ final KnowledgeBase kbase = KnowledgeBaseFactory.newKnowledgeBase();
+ kbase.addKnowledgePackages(kbuilder.getKnowledgePackages());
+
+ StatefulKnowledgeSession ksession = kbase.newStatefulKnowledgeSession();
+
+ List<String> list = new ArrayList<String>();
+ ksession.setGlobal( "list", list );
+
+ Person p = new Person( "bobba fet", 32);
+ ksession.insert( p );
+ org.drools.runtime.process.ProcessInstance processInstance = ksession.startProcess("org.test.ruleflow");
+
+ assertEquals(1, ksession.getProcessInstances().size());
+
+ String process2 =
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "<process xmlns=\"http://drools.org/drools-5.0/process\"\n" +
+ " xmlns:xs=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+ " xs:schemaLocation=\"http://drools.org/drools-5.0/process drools-processes-5.0.xsd\"\n" +
+ " type=\"RuleFlow\" name=\"ruleflow\" id=\"org.test.ruleflow2\" package-name=\"org.test\" >\n" +
+ " <header>\n" +
+ " <globals>\n" +
+ " <global identifier=\"list\" type=\"java.util.List\" />\n" +
+ " </globals>\n" +
+ " </header>\n" +
+ " <nodes>\n" +
+ " <start id=\"1\" name=\"Start\" />\n" +
+ " <ruleSet id=\"2\" name=\"Hello\" ruleFlowGroup=\"hello\" />\n" +
+ " <actionNode id=\"4\" name=\"Action\" >" +
+ " <action type=\"expression\" dialect=\"java\">System.out.println();\n" +
+ "list.add(\"Executed\");</action>\n" +
+ " </actionNode>\n" +
+ " <end id=\"3\" name=\"End\" />\n" +
+ " </nodes>\n" +
+ " <connections>\n" +
+ " <connection from=\"1\" to=\"2\"/>\n" +
+ " <connection from=\"2\" to=\"4\"/>\n" +
+ " <connection from=\"4\" to=\"3\"/>\n" +
+ " </connections>\n" +
+ "</process>";
+ kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();
+ kbuilder.add(new ByteArrayResource(process2.getBytes()), ResourceType.DRF);
+ kbase.addKnowledgePackages(kbuilder.getKnowledgePackages());
+
+ WorkflowProcessInstanceUpgrader.upgradeProcessInstance(
+ ksession, processInstance.getId(), "org.test.ruleflow2", new HashMap<String, Long>());
+ assertEquals("org.test.ruleflow2", processInstance.getProcessId());
+
+ ksession.fireAllRules();
+
+ assertEquals(2, list.size());
+ assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
+ }
+
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/node/Split.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/node/Split.java 2009-06-28 23:07:51 UTC (rev 27263)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/node/Split.java 2009-06-28 23:52:43 UTC (rev 27264)
@@ -18,7 +18,6 @@
import java.util.Collections;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import org.drools.definition.process.Connection;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/WorkflowProcessInstanceUpgrader.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/WorkflowProcessInstanceUpgrader.java 2009-06-28 23:07:51 UTC (rev 27263)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/WorkflowProcessInstanceUpgrader.java 2009-06-28 23:52:43 UTC (rev 27264)
@@ -1,21 +1,43 @@
package org.drools.workflow.instance;
+import java.util.HashMap;
import java.util.Map;
import org.drools.WorkingMemory;
import org.drools.common.InternalRuleBase;
import org.drools.common.InternalWorkingMemory;
+import org.drools.definition.process.NodeContainer;
import org.drools.definition.process.WorkflowProcess;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.impl.StatefulKnowledgeSessionImpl;
+import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.process.NodeInstance;
-import org.drools.runtime.process.WorkflowProcessInstance;
+import org.drools.workflow.core.impl.NodeImpl;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
import org.drools.workflow.instance.impl.WorkflowProcessInstanceImpl;
public class WorkflowProcessInstanceUpgrader {
-
- public static void upgradeProcessInstance(WorkingMemory workingMemory, long processInstanceId, String processId, Map<Long, Long> nodeMapping) {
- WorkflowProcessInstance processInstance = (WorkflowProcessInstance)
+
+ public static void upgradeProcessInstance(
+ StatefulKnowledgeSession session,
+ long processInstanceId,
+ String processId,
+ Map<String, Long> nodeMapping) {
+ upgradeProcessInstance(
+ ((StatefulKnowledgeSessionImpl) session).session,
+ processInstanceId,
+ processId,
+ nodeMapping);
+ }
+
+ public static void upgradeProcessInstance(
+ WorkingMemory workingMemory,
+ long processInstanceId,
+ String processId,
+ Map<String, Long> nodeMapping) {
+ if (nodeMapping == null) {
+ nodeMapping = new HashMap<String, Long>();
+ }
+ WorkflowProcessInstanceImpl processInstance = (WorkflowProcessInstanceImpl)
workingMemory.getProcessInstance(processInstanceId);
if (processInstance == null) {
throw new IllegalArgumentException("Could not find process instance " + processInstanceId);
@@ -31,23 +53,32 @@
if (processInstance.getProcessId().equals(processId)) {
return;
}
- ((WorkflowProcessInstanceImpl) processInstance).disconnect();
- ((ProcessInstance) processInstance).setProcess(process);
- for (NodeInstance nodeInstance: processInstance.getNodeInstances()) {
- Long oldNodeId = nodeInstance.getNodeId();
+ synchronized (processInstance) {
+ org.drools.definition.process.Process oldProcess = processInstance.getProcess();
+ processInstance.disconnect();
+ processInstance.setProcess(oldProcess);
+ updateNodeInstances(processInstance, nodeMapping);
+ processInstance.setWorkingMemory((InternalWorkingMemory) workingMemory);
+ processInstance.setProcess(process);
+ processInstance.reconnect();
+ }
+ }
+
+ private static void updateNodeInstances(NodeInstanceContainer nodeInstanceContainer, Map<String, Long> nodeMapping) {
+ NodeContainer nodeContainer = nodeInstanceContainer.getNodeContainer();
+ for (NodeInstance nodeInstance: nodeInstanceContainer.getNodeInstances()) {
+ String oldNodeId = ((NodeImpl)
+ ((org.drools.workflow.instance.NodeInstance) nodeInstance).getNode()).getUniqueId();
Long newNodeId = nodeMapping.get(oldNodeId);
if (newNodeId == null) {
- newNodeId = oldNodeId;
+ newNodeId = nodeInstance.getNodeId();
}
- if (process.getNode(newNodeId) == null) {
- throw new IllegalArgumentException("Could not find node " + newNodeId);
+ ((NodeInstanceImpl) nodeInstance).setNodeId(newNodeId);
+ if (nodeInstance instanceof NodeInstanceContainer) {
+ updateNodeInstances((NodeInstanceContainer) nodeInstance, nodeMapping);
}
- if (newNodeId != oldNodeId) {
- ((NodeInstanceImpl) nodeInstance).setNodeId(newNodeId);
- }
}
- ((ProcessInstance) processInstance).setWorkingMemory((InternalWorkingMemory) workingMemory);
- ((WorkflowProcessInstanceImpl) processInstance).reconnect();
+
}
}
More information about the jboss-svn-commits
mailing list