This is an automated email from the ASF dual-hosted git repository.
mariofusco pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-drools.git
The following commit(s) were added to refs/heads/main by this push:
new fbbff6c00d [KIE-1079] fix executable model generation when a query
name containts an underscore (#5838)
fbbff6c00d is described below
commit fbbff6c00d1e45195c3d12da3ddd8ffde0d3a1fc
Author: Mario Fusco <[email protected]>
AuthorDate: Thu Apr 11 10:08:38 2024 +0200
[KIE-1079] fix executable model generation when a query name containts an
underscore (#5838)
---
.../main/java/org/drools/model/codegen/execmodel/PackageModel.java | 3 +--
.../codegen/execmodel/generator/visitor/pattern/PatternVisitor.java | 3 ++-
.../src/test/java/org/drools/model/codegen/execmodel/QueryTest.java | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/PackageModel.java
b/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/PackageModel.java
index 121b722bc1..254ddbb8e5 100644
---
a/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/PackageModel.java
+++
b/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/PackageModel.java
@@ -418,8 +418,7 @@ public class PackageModel {
}
public void putQueryVariable(String queryName, QueryParameter qp) {
- this.queryVariables.computeIfAbsent(queryName, k -> new ArrayList<>());
- this.queryVariables.get(queryName).add(qp);
+ this.queryVariables.computeIfAbsent(queryName, k -> new
ArrayList<>()).add(qp);
}
public List<QueryParameter> queryVariables(String queryName) {
diff --git
a/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/generator/visitor/pattern/PatternVisitor.java
b/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/generator/visitor/pattern/PatternVisitor.java
index 8c84f66cc4..2ddfceeb83 100644
---
a/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/generator/visitor/pattern/PatternVisitor.java
+++
b/drools-model/drools-model-codegen/src/main/java/org/drools/model/codegen/execmodel/generator/visitor/pattern/PatternVisitor.java
@@ -31,6 +31,7 @@ import org.drools.model.codegen.execmodel.util.PatternUtil;
import static
org.drools.model.codegen.execmodel.generator.QueryGenerator.QUERY_METHOD_PREFIX;
import static
org.drools.model.codegen.execmodel.generator.QueryGenerator.toQueryDef;
+import static org.drools.modelcompiler.util.StringUtil.toId;
public class PatternVisitor {
@@ -75,7 +76,7 @@ public class PatternVisitor {
private DSLNode parsePatternWithClass(PatternDescr pattern, String
className) {
List<? extends BaseDescr> constraintDescrs =
pattern.getConstraint().getDescrs();
- String queryName = QUERY_METHOD_PREFIX + className;
+ String queryName = QUERY_METHOD_PREFIX + toId( className );
String queryDef = toQueryDef( className );
// Expression is a query, get bindings from query parameter type
diff --git
a/drools-model/drools-model-codegen/src/test/java/org/drools/model/codegen/execmodel/QueryTest.java
b/drools-model/drools-model-codegen/src/test/java/org/drools/model/codegen/execmodel/QueryTest.java
index 8e4d5218e2..65f5cc039a 100644
---
a/drools-model/drools-model-codegen/src/test/java/org/drools/model/codegen/execmodel/QueryTest.java
+++
b/drools-model/drools-model-codegen/src/test/java/org/drools/model/codegen/execmodel/QueryTest.java
@@ -120,11 +120,11 @@ public class QueryTest extends BaseModelTest {
String str =
"import " + Result.class.getCanonicalName() + ";" +
"import " + Person.class.getCanonicalName() + ";" +
- "query olderThan( Person $p, int $age )\n" +
+ "query older_than( Person $p, int $age )\n" +
" $p := Person(age > $age)\n" +
"end\n" +
"rule R when\n" +
- " olderThan( $p, 40; )\n" +
+ " older_than( $p, 40; )\n" +
"then\n" +
" insert(new Result($p.getName()));\n" +
"end";
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
