[jboss-svn-commits] JBL Code SVN: r25417 - in labs/jbossrules/trunk/drools-compiler/src: main/resources/org/drools/rule/builder/dialect/java and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Feb 24 22:28:53 EST 2009
Author: KrisVerlaenen
Date: 2009-02-24 22:28:53 -0500 (Tue, 24 Feb 2009)
New Revision: 25417
Modified:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/AbstractJavaProcessBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaActionBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/rule/builder/dialect/java/javaInvokers.mvel
labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/rule/builder/dialect/java/javaRule.mvel
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessActionTest.java
Log:
JBRULES-1980: Direct access to process variables in actions using Java dialect
- java dialect now has access to process variables directly
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/AbstractJavaProcessBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/AbstractJavaProcessBuilder.java 2009-02-25 03:26:57 UTC (rev 25416)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/AbstractJavaProcessBuilder.java 2009-02-25 03:28:53 UTC (rev 25417)
@@ -5,7 +5,11 @@
import java.util.List;
import java.util.Map;
+import org.drools.compiler.DescrBuildError;
import org.drools.lang.descr.BaseDescr;
+import org.drools.process.core.ContextResolver;
+import org.drools.process.core.context.variable.Variable;
+import org.drools.process.core.context.variable.VariableScope;
import org.drools.rule.builder.ProcessBuildContext;
import org.drools.util.StringUtils;
import org.mvel2.integration.impl.MapVariableResolverFactory;
@@ -78,7 +82,33 @@
return map;
}
+
+ public Map createVariableContext(
+ final String className,
+ final String text,
+ final ProcessBuildContext context,
+ final String[] globals,
+ final List<String> unboundIdentifiers,
+ final ContextResolver contextResolver) {
+ Map map = createVariableContext(className, text, context, globals);
+ List<String> variables = new ArrayList<String>();
+ final List variableTypes = new ArrayList(globals.length);
+ for (String variableName: unboundIdentifiers) {
+ VariableScope variableScope = (VariableScope) contextResolver.resolveContext(VariableScope.VARIABLE_SCOPE, variableName);
+ if (variableScope != null) {
+ variables.add(variableName);
+ variableTypes.add(variableScope.findVariable(variableName).getType().getStringType());
+ }
+ }
+ map.put("variables",
+ variables);
+
+ map.put("variableTypes",
+ variableTypes);
+ return map;
+ }
+
public void generatTemplates(final String ruleTemplate,
final String invokerTemplate,
final ProcessBuildContext context,
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaActionBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaActionBuilder.java 2009-02-25 03:26:57 UTC (rev 25416)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaActionBuilder.java 2009-02-25 03:28:53 UTC (rev 25417)
@@ -37,19 +37,8 @@
implements
ActionBuilder {
- /* (non-Javadoc)
- * @see org.drools.semantics.java.builder.ConsequenceBuilder#buildConsequence(org.drools.semantics.java.builder.BuildContext, org.drools.semantics.java.builder.BuildUtils, org.drools.lang.descr.RuleDescr)
- */
public void build(final PackageBuildContext context,
final DroolsAction action,
- final ActionDescr actionDescr) {
- build( context,
- action,
- actionDescr,
- null );
- }
- public void build(final PackageBuildContext context,
- final DroolsAction action,
final ActionDescr actionDescr,
final ContextResolver contextResolver) {
@@ -73,7 +62,9 @@
final Map map = createVariableContext( className,
actionDescr.getText(),
(ProcessBuildContext) context,
- (String[]) usedIdentifiers[1].toArray( new String[usedIdentifiers[1].size()] ) );
+ (String[]) usedIdentifiers[1].toArray( new String[usedIdentifiers[1].size()] ),
+ analysis.getNotBoundedIdentifiers(),
+ contextResolver);
map.put( "text",
dialect.getKnowledgeHelperFixer().fix( actionDescr.getText() ));
Modified: labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/rule/builder/dialect/java/javaInvokers.mvel
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/rule/builder/dialect/java/javaInvokers.mvel 2009-02-25 03:26:57 UTC (rev 25416)
+++ labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/rule/builder/dialect/java/javaInvokers.mvel 2009-02-25 03:28:53 UTC (rev 25417)
@@ -374,9 +374,14 @@
@foreach{type : globalTypes, identifier : globals} @{type} @{identifier} = ( @{type} ) workingMemory.getGlobal( "@{identifier}" );
@end{}
+ @foreach{type : variableTypes, identifier : variables} @{type} @{identifier} = ( @{type} ) context.getVariable( "@{identifier}" );
+ @end{}
+
@{processClassName}.@{methodName} (
knowledgeHelper at if{globals != empty}, at end{}
@foreach{identifier : globals} @{identifier}
+ @end{","}@if{variables != empty}, at end{}
+ @foreach{identifier : variables} @{identifier}
@end{","}, context );
}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/rule/builder/dialect/java/javaRule.mvel
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/rule/builder/dialect/java/javaRule.mvel 2009-02-25 03:26:57 UTC (rev 25416)
+++ labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/rule/builder/dialect/java/javaRule.mvel 2009-02-25 03:28:53 UTC (rev 25417)
@@ -106,7 +106,7 @@
@end{}
@declare{"actionMethod"}
-public static void @{methodName}(org.drools.spi.KnowledgeHelper drools at if{globals != empty}, at end{} @foreach{type :globalTypes, identifier : globals} @{type} @{identifier} @end{","}, org.drools.spi.ProcessContext context ) throws Exception {
+public static void @{methodName}(org.drools.spi.KnowledgeHelper drools at if{globals != empty}, at end{} @foreach{type :globalTypes, identifier : globals} @{type} @{identifier} @end{","} @if{variables != empty}, at end{} @foreach{type2 :variableTypes, identifier2 : variables} @{type2} @{identifier2} @end{","}, org.drools.spi.ProcessContext context ) throws Exception {
org.drools.runtime.process.ProcessContext kcontext = context;
@{text}
}
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessActionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessActionTest.java 2009-02-25 03:26:57 UTC (rev 25416)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessActionTest.java 2009-02-25 03:28:53 UTC (rev 25417)
@@ -3,8 +3,10 @@
import java.io.Reader;
import java.io.StringReader;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import junit.framework.TestCase;
@@ -123,9 +125,9 @@
" <start id=\"1\" name=\"Start\" />\n" +
" <actionNode id=\"2\" name=\"MyActionNode\" >\n" +
" <action type=\"expression\" dialect=\"java\" >System.out.println(\"Triggered\");\n" +
- "String variable = (String) context.getVariable(\"variable\");\n" +
+ "String myVariable = (String) context.getVariable(\"variable\");\n" +
"System.out.println(drools.getWorkingMemory());\n" +
- "list.add(variable);\n" +
+ "list.add(myVariable);\n" +
"String nodeName = context.getNodeInstance().getNodeName();\n" +
"list.add(nodeName);\n" +
"nodeName = kcontext.getNodeInstance().getNodeName();\n" +
@@ -247,6 +249,132 @@
assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
}
+ public void testActionVariableJava() {
+ 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=\"flow\" id=\"org.drools.actions\" package-name=\"org.drools\" version=\"1\" >\n" +
+ "\n" +
+ " <header>\n" +
+ " <imports>\n" +
+ " <import name=\"org.drools.integrationtests.ProcessActionTest.TestVariable\" />\n" +
+ " </imports>\n" +
+ " <globals>\n" +
+ " <global identifier=\"list\" type=\"java.util.List\" />\n" +
+ " </globals>\n" +
+ " <variables>\n" +
+ " <variable name=\"person\" >\n" +
+ " <type name=\"org.drools.process.core.datatype.impl.type.ObjectDataType\" className=\"org.drools.integrationtests.ProcessActionTest.TestVariable\" />\n" +
+ " </variable>\n" +
+ " </variables>\n" +
+ " </header>\n" +
+ "\n" +
+ " <nodes>\n" +
+ " <start id=\"1\" name=\"Start\" />\n" +
+ " <actionNode id=\"2\" name=\"MyActionNode\" >\n" +
+ " <action type=\"expression\" dialect=\"java\" >System.out.println(\"Triggered\");\n" +
+ "list.add(person.getName());\n" +
+ "</action>\n" +
+ " </actionNode>\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" +
+ "\n" +
+ "</process>");
+ builder.addRuleFlow(source);
+ PackageBuilderErrors errors = builder.getErrors();
+ if (!errors.isEmpty()) {
+ for (DroolsError error: errors.getErrors()) {
+ System.err.println(error);
+ }
+ fail("Errors while building package");
+ }
+ Package pkg = builder.getPackage();
+ RuleBase ruleBase = RuleBaseFactory.newRuleBase();
+ ruleBase.addPackage( pkg );
+ WorkingMemory workingMemory = ruleBase.newStatefulSession();
+ List<String> list = new ArrayList<String>();
+ workingMemory.setGlobal("list", list);
+ TestVariable person = new TestVariable("John Doe");
+ Map<String, Object> params = new HashMap<String, Object>();
+ params.put("person", person);
+ ProcessInstance processInstance =
+ workingMemory.startProcess("org.drools.actions", params);
+ assertEquals(1, list.size());
+ assertEquals("John Doe", list.get(0));
+ assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
+ }
+
+ public void testActionVariableMVEL() {
+ 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=\"flow\" id=\"org.drools.actions\" package-name=\"org.drools\" version=\"1\" >\n" +
+ "\n" +
+ " <header>\n" +
+ " <imports>\n" +
+ " <import name=\"org.drools.integrationtests.ProcessActionTest.TestVariable\" />\n" +
+ " </imports>\n" +
+ " <globals>\n" +
+ " <global identifier=\"list\" type=\"java.util.List\" />\n" +
+ " </globals>\n" +
+ " <variables>\n" +
+ " <variable name=\"person\" >\n" +
+ " <type name=\"org.drools.process.core.datatype.impl.type.ObjectDataType\" className=\"TestVariable\" />\n" +
+ " </variable>\n" +
+ " </variables>\n" +
+ " </header>\n" +
+ "\n" +
+ " <nodes>\n" +
+ " <start id=\"1\" name=\"Start\" />\n" +
+ " <actionNode id=\"2\" name=\"MyActionNode\" >\n" +
+ " <action type=\"expression\" dialect=\"mvel\" >System.out.println(\"Triggered\");\n" +
+ "list.add(person.name);\n" +
+ "</action>\n" +
+ " </actionNode>\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" +
+ "\n" +
+ "</process>");
+ builder.addRuleFlow(source);
+ PackageBuilderErrors errors = builder.getErrors();
+ if (!errors.isEmpty()) {
+ for (DroolsError error: errors.getErrors()) {
+ System.err.println(error);
+ }
+ fail("Errors while building package");
+ }
+ Package pkg = builder.getPackage();
+ RuleBase ruleBase = RuleBaseFactory.newRuleBase();
+ ruleBase.addPackage( pkg );
+ WorkingMemory workingMemory = ruleBase.newStatefulSession();
+ List<String> list = new ArrayList<String>();
+ workingMemory.setGlobal("list", list);
+ TestVariable person = new TestVariable("John Doe");
+ Map<String, Object> params = new HashMap<String, Object>();
+ params.put("person", person);
+ ProcessInstance processInstance =
+ workingMemory.startProcess("org.drools.actions", params);
+ assertEquals(1, list.size());
+ assertEquals("John Doe", list.get(0));
+ assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
+ }
+
private static class TestWorkItemHandler implements WorkItemHandler {
private WorkItem workItem;
public void executeWorkItem(WorkItem workItem, WorkItemManager manager) {
@@ -258,4 +386,18 @@
return workItem;
}
}
+
+ public static class TestVariable {
+
+ private String name;
+
+ public TestVariable(String name) {
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ }
}
More information about the jboss-svn-commits
mailing list