Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[DROOLS-7635] ansible-rulebook : Raise an error when a condition comp… #123

Merged
merged 1 commit into from
Oct 24, 2024
Merged

[DROOLS-7635] ansible-rulebook : Raise an error when a condition comp… #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions ...ntegration-api/src/main/java/org/drools/ansible/rulebook/integration/api/domain/Rule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ public class Rule {

private final RuleGenerationContext ruleGenerationContext = new RuleGenerationContext();

private String ruleSetName;

private String name;

private Action action;
Expand All @@ -31,6 +33,14 @@ public class Rule {

private Condition condition;

public String getRuleSetName() {
return ruleSetName;
}

public void setRuleSetName(String ruleSetName) {
this.ruleSetName = ruleSetName;
}

public String getName() {
return name;
}
Expand Down
20 changes: 10 additions & 10 deletions ...c/main/java/org/drools/ansible/rulebook/integration/api/domain/RuleGenerationContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,23 +224,23 @@ List<Rule> toExecModelRules(RulesSet rulesSet, org.drools.ansible.rulebook.integ
if (getRuleName() == null) {
setRuleName("r_" + ruleCounter.getAndIncrement());
}
setRuleSetName(rulesSet.getName());


List<org.drools.model.Rule> rules = createRules(rulesExecutionController);
if (hasTemporalConstraint(ansibleRule)) {
rulesSet.withOptions(RuleConfigurationOption.EVENTS_PROCESSING);
}
return rules;
}

private void updateContextFromRule(org.drools.ansible.rulebook.integration.api.domain.Rule anisbleRule) {
setRuleName(anisbleRule.getName());
setAction(anisbleRule.getAction());
if (anisbleRule.getOptions() != null) {
addOptions(anisbleRule.getOptions().getOptions());
}
setCondition(anisbleRule.getCondition());
}
private void updateContextFromRule(org.drools.ansible.rulebook.integration.api.domain.Rule anisbleRule) {
setRuleSetName(anisbleRule.getRuleSetName());
Copy link
Collaborator Author

@tkobayas tkobayas Oct 23, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ruleSetName needs to be populated here. Previously, it was set in toExecModelRules, but runtime engine (AstRulesEngine, AsyncAstRulesEngine = used by drools_jpy) may call rulesSet.hasTemporalConstraint and rulesSet.hasAsyncExecution earlier and they create operator instances, so ruleSetName was null in an error log.

There are several ways to bring ruleSetName, but having rulesetName in Rule seems to be clean and easy to understand.

setRuleName(anisbleRule.getName());
setAction(anisbleRule.getAction());
if (anisbleRule.getOptions() != null) {
addOptions(anisbleRule.getOptions().getOptions());
}
setCondition(anisbleRule.getCondition());
}

private static class StackedContext<K, V> {
private final Deque<Map<K, V>> stack = new ArrayDeque<>();
Expand Down
1 change: 1 addition & 0 deletions ...ration-api/src/main/java/org/drools/ansible/rulebook/integration/api/domain/RulesSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ public List<RuleContainer> getRules() {

public void setRules(List<RuleContainer> rules) {
this.rules = rules;
rules.forEach(ruleContainer -> ruleContainer.getRule().setRuleSetName(name));
}

public Rule addRule() {
Expand Down
Loading