[jboss-svn-commits] JBL Code SVN: r34073 - 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
Tue Jul 20 15:26:06 EDT 2010
Author: KrisVerlaenen
Date: 2010-07-20 15:26:05 -0400 (Tue, 20 Jul 2010)
New Revision: 34073
Modified:
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessForEachTest.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/node/ForEachNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/ForEachNodeInstance.java
Log:
JBRULES-2585: ForEachNode should continue if collection is empty
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessForEachTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessForEachTest.java 2010-07-20 18:48:06 UTC (rev 34072)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessForEachTest.java 2010-07-20 19:26:05 UTC (rev 34073)
@@ -159,6 +159,121 @@
assertEquals(10000, myList.size());
}
+ public void testForEachEmptyList() {
+ PackageBuilder builder = new PackageBuilder();
+ Reader source = new StringReader(
+ "<?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=\"ForEach\" id=\"org.drools.ForEach\" package-name=\"org.drools\" >\n" +
+ " <header>\n" +
+ " <globals>\n" +
+ " <global identifier=\"myList\" type=\"java.util.List\" />\n" +
+ " </globals>\n" +
+ " <variables>\n" +
+ " <variable name=\"collection\" >\n" +
+ " <type name=\"org.drools.process.core.datatype.impl.type.ObjectDataType\" className=\"java.util.List\" />\n" +
+ " </variable>\n" +
+ " </variables>\n" +
+ " </header>\n" +
+ "\n" +
+ " <nodes>\n" +
+ " <forEach id=\"2\" name=\"ForEach\" variableName=\"item\" collectionExpression=\"collection\" >\n" +
+ " <nodes>\n" +
+ " <actionNode id=\"1\" name=\"Action\" >\n" +
+ " <action type=\"expression\" dialect=\"mvel\" >myList.add(item);</action>\n" +
+ " </actionNode>\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" +
+ " </forEach>\n" +
+ " <start id=\"1\" name=\"Start\" />\n" +
+ " <end id=\"3\" name=\"End\" />\n" +
+ " </nodes>\n" +
+ "\n" +
+ " <connections>\n" +
+ " <connection from=\"1\" to=\"2\" />\n" +
+ " <connection from=\"2\" to=\"3\" />\n" +
+ " </connections>\n" +
+ "</process>");
+ builder.addRuleFlow(source);
+ Package pkg = builder.getPackage();
+ RuleBase ruleBase = RuleBaseFactory.newRuleBase();
+ ruleBase.addPackage( pkg );
+ WorkingMemory workingMemory = ruleBase.newStatefulSession();
+ List<String> myList = new ArrayList<String>();
+ workingMemory.setGlobal("myList", myList);
+ List<String> collection = new ArrayList<String>();
+ Map<String, Object> params = new HashMap<String, Object>();
+ params.put("collection", collection);
+ ProcessInstance processInstance = ( ProcessInstance )
+ workingMemory.startProcess("org.drools.ForEach", params);
+ assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
+ }
+
+ public void testForEachNullList() {
+ PackageBuilder builder = new PackageBuilder();
+ Reader source = new StringReader(
+ "<?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=\"ForEach\" id=\"org.drools.ForEach\" package-name=\"org.drools\" >\n" +
+ " <header>\n" +
+ " <globals>\n" +
+ " <global identifier=\"myList\" type=\"java.util.List\" />\n" +
+ " </globals>\n" +
+ " <variables>\n" +
+ " <variable name=\"collection\" >\n" +
+ " <type name=\"org.drools.process.core.datatype.impl.type.ObjectDataType\" className=\"java.util.List\" />\n" +
+ " </variable>\n" +
+ " </variables>\n" +
+ " </header>\n" +
+ "\n" +
+ " <nodes>\n" +
+ " <forEach id=\"2\" name=\"ForEach\" variableName=\"item\" collectionExpression=\"collection\" >\n" +
+ " <nodes>\n" +
+ " <actionNode id=\"1\" name=\"Action\" >\n" +
+ " <action type=\"expression\" dialect=\"mvel\" >myList.add(item);</action>\n" +
+ " </actionNode>\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" +
+ " </forEach>\n" +
+ " <start id=\"1\" name=\"Start\" />\n" +
+ " <end id=\"3\" name=\"End\" />\n" +
+ " </nodes>\n" +
+ "\n" +
+ " <connections>\n" +
+ " <connection from=\"1\" to=\"2\" />\n" +
+ " <connection from=\"2\" to=\"3\" />\n" +
+ " </connections>\n" +
+ "</process>");
+ builder.addRuleFlow(source);
+ Package pkg = builder.getPackage();
+ RuleBase ruleBase = RuleBaseFactory.newRuleBase();
+ ruleBase.addPackage( pkg );
+ WorkingMemory workingMemory = ruleBase.newStatefulSession();
+ List<String> myList = new ArrayList<String>();
+ workingMemory.setGlobal("myList", myList);
+ ProcessInstance processInstance = ( ProcessInstance )
+ workingMemory.startProcess("org.drools.ForEach");
+ assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
+ }
+
public void testForEachCancel() {
PackageBuilder builder = new PackageBuilder();
Reader source = new StringReader(
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/node/ForEachNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/node/ForEachNode.java 2010-07-20 18:48:06 UTC (rev 34072)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/node/ForEachNode.java 2010-07-20 19:26:05 UTC (rev 34073)
@@ -98,6 +98,14 @@
return (CompositeContextNode) super.getNode(2);
}
+ public ForEachSplitNode getForEachSplitNode() {
+ return (ForEachSplitNode) super.getNode(1);
+ }
+
+ public ForEachJoinNode getForEachJoinNode() {
+ return (ForEachJoinNode) super.getNode(3);
+ }
+
public void addNode(Node node) {
getCompositeNode().addNode(node);
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/ForEachNodeInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/ForEachNodeInstance.java 2010-07-20 18:48:06 UTC (rev 34072)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/ForEachNodeInstance.java 2010-07-20 19:26:05 UTC (rev 34073)
@@ -80,22 +80,26 @@
String collectionExpression = getForEachNode().getCollectionExpression();
Collection<?> collection = evaluateCollectionExpression(collectionExpression);
((NodeInstanceContainer) getNodeInstanceContainer()).removeNodeInstance(this);
- List<NodeInstance> nodeInstances = new ArrayList<NodeInstance>();
- for (Object o: collection) {
- String variableName = getForEachNode().getVariableName();
- CompositeNodeInstance nodeInstance = (CompositeNodeInstance)
- ((NodeInstanceContainer) getNodeInstanceContainer()).getNodeInstance(getForEachSplitNode().getTo().getTo());
- VariableScopeInstance variableScopeInstance = (VariableScopeInstance)
- nodeInstance.resolveContextInstance(VariableScope.VARIABLE_SCOPE, variableName);
- variableScopeInstance.setVariable(variableName, o);
- nodeInstances.add(nodeInstance);
+ if (collection.isEmpty()) {
+ ForEachNodeInstance.this.triggerCompleted(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE, true);
+ } else {
+ List<NodeInstance> nodeInstances = new ArrayList<NodeInstance>();
+ for (Object o: collection) {
+ String variableName = getForEachNode().getVariableName();
+ CompositeNodeInstance nodeInstance = (CompositeNodeInstance)
+ ((NodeInstanceContainer) getNodeInstanceContainer()).getNodeInstance(getForEachSplitNode().getTo().getTo());
+ VariableScopeInstance variableScopeInstance = (VariableScopeInstance)
+ nodeInstance.resolveContextInstance(VariableScope.VARIABLE_SCOPE, variableName);
+ variableScopeInstance.setVariable(variableName, o);
+ nodeInstances.add(nodeInstance);
+ }
+ for (NodeInstance nodeInstance: nodeInstances) {
+ ((org.drools.workflow.instance.NodeInstance) nodeInstance).trigger(this, getForEachSplitNode().getTo().getToType());
+ }
+ if (!getForEachNode().isWaitForCompletion()) {
+ ForEachNodeInstance.this.triggerCompleted(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE, false);
+ }
}
- for (NodeInstance nodeInstance: nodeInstances) {
- ((org.drools.workflow.instance.NodeInstance) nodeInstance).trigger(this, getForEachSplitNode().getTo().getToType());
- }
- if (!getForEachNode().isWaitForCompletion()) {
- ForEachNodeInstance.this.triggerCompleted(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE, false);
- }
}
private Collection<?> evaluateCollectionExpression(String collectionExpression) {
More information about the jboss-svn-commits
mailing list