Skip to content
Snippets Groups Projects
Commit 94348931 authored by Mario Fusco's avatar Mario Fusco Committed by GitHub
Browse files

[DROOLS-1446] make BoundIdentifiers to accept a PackageBuildContext (#764)

parent 0f3c99c2
Branches
Tags
1 merge request!17refresh master
......@@ -17,19 +17,14 @@
package org.jbpm.process.builder.dialect.java;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import org.drools.compiler.compiler.AnalysisResult;
import org.drools.compiler.compiler.BoundIdentifiers;
import org.drools.compiler.lang.descr.ActionDescr;
import org.drools.compiler.lang.descr.RuleDescr;
import org.drools.compiler.rule.builder.PackageBuildContext;
import org.drools.compiler.rule.builder.RuleBuildContext;
import org.drools.compiler.rule.builder.dialect.java.JavaAnalysisResult;
import org.drools.compiler.rule.builder.dialect.java.JavaDialect;
import org.drools.compiler.rule.builder.dialect.java.parser.JavaLocalDeclarationDescr;
import org.jbpm.process.builder.ActionBuilder;
import org.jbpm.process.builder.ProcessBuildContext;
import org.jbpm.process.core.ContextResolver;
......@@ -69,11 +64,8 @@ public class JavaActionBuilder extends AbstractJavaProcessBuilder
final ActionDescr actionDescr) {
JavaDialect dialect = (JavaDialect) context.getDialect( "java" );
RuleDescr ruleDescr = new RuleDescr(actionDescr.getText());
RuleBuildContext rcontext = new RuleBuildContext( context.getKnowledgeBuilder(), ruleDescr, context.getDialectRegistry(), context.getPkg(), dialect);
Map<String, Class<?>> variables = new HashMap<String,Class<?>>();
BoundIdentifiers boundIdentifiers = new BoundIdentifiers(variables, rcontext);
BoundIdentifiers boundIdentifiers = new BoundIdentifiers(variables, context);
AnalysisResult analysis = dialect.analyzeBlock( context,
actionDescr,
actionDescr.getText(),
......
......@@ -23,9 +23,7 @@ import java.util.Set;
import org.drools.compiler.compiler.AnalysisResult;
import org.drools.compiler.compiler.BoundIdentifiers;
import org.drools.compiler.compiler.ReturnValueDescr;
import org.drools.compiler.lang.descr.RuleDescr;
import org.drools.compiler.rule.builder.PackageBuildContext;
import org.drools.compiler.rule.builder.RuleBuildContext;
import org.drools.compiler.rule.builder.dialect.java.JavaDialect;
import org.jbpm.process.builder.ProcessBuildContext;
import org.jbpm.process.builder.ReturnValueEvaluatorBuilder;
......@@ -70,11 +68,8 @@ public class JavaReturnValueEvaluatorBuilder extends AbstractJavaProcessBuilder
JavaDialect dialect = (JavaDialect) context.getDialect( "java" );
RuleDescr ruleDescr = new RuleDescr(descr.getText());
RuleBuildContext rcontext = new RuleBuildContext( context.getKnowledgeBuilder(), ruleDescr, context.getDialectRegistry(), context.getPkg(), dialect);
Map<String, Class<?>> variables = new HashMap<String,Class<?>>();
BoundIdentifiers boundIdentifiers = new BoundIdentifiers(variables, rcontext);
BoundIdentifiers boundIdentifiers = new BoundIdentifiers(variables, context);
AnalysisResult analysis = dialect.analyzeBlock( context,
descr,
descr.getText(),
......
......@@ -22,9 +22,7 @@ import java.util.Set;
import org.drools.compiler.compiler.AnalysisResult;
import org.drools.compiler.compiler.BoundIdentifiers;
import org.drools.compiler.lang.descr.BaseDescr;
import org.drools.compiler.lang.descr.RuleDescr;
import org.drools.compiler.rule.builder.PackageBuildContext;
import org.drools.compiler.rule.builder.RuleBuildContext;
import org.drools.compiler.rule.builder.dialect.mvel.MVELAnalysisResult;
import org.drools.compiler.rule.builder.dialect.mvel.MVELDialect;
import org.jbpm.process.builder.ProcessBuildContext;
......@@ -96,13 +94,9 @@ public class AbstractMVELBuilder {
// we can't know all the types ahead of time with processes, but we don't need return types, so it's ok
context.setTypesafe( false );
RuleDescr ruleDescr = new RuleDescr(descr.getText());
RuleBuildContext rcontext = new RuleBuildContext( context.getKnowledgeBuilder(), ruleDescr, context.getDialectRegistry(), context.getPkg(), dialect);
MVELAnalysisResult analysis = null;
try {
BoundIdentifiers boundIdentifiers
= new BoundIdentifiers(variables, rcontext);
BoundIdentifiers boundIdentifiers = new BoundIdentifiers(variables, context);
analysis = ( MVELAnalysisResult ) dialect.analyzeBlock( context,
text,
boundIdentifiers,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment