From 2d46c3aff4259158c1c2e0cdc2ce28bdcc95ff55 Mon Sep 17 00:00:00 2001
From: Toshiya Kobayashi <toshiyakobayashi@gmail.com>
Date: Wed, 23 Oct 2024 15:01:33 +0900
Subject: [PATCH] [DROOLS-7635] ansible-rulebook : Raise an error when a
 condition compares incompatible types - don't miss to populate ruleSetName
 when runtime is used

---
 .../rulebook/integration/api/domain/Rule.java | 10 ++++++++++
 .../api/domain/RuleGenerationContext.java     | 20 +++++++++----------
 .../integration/api/domain/RulesSet.java      |  1 +
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/drools-ansible-rulebook-integration-api/src/main/java/org/drools/ansible/rulebook/integration/api/domain/Rule.java b/drools-ansible-rulebook-integration-api/src/main/java/org/drools/ansible/rulebook/integration/api/domain/Rule.java
index fd05d167..23c87b8b 100644
--- a/drools-ansible-rulebook-integration-api/src/main/java/org/drools/ansible/rulebook/integration/api/domain/Rule.java
+++ b/drools-ansible-rulebook-integration-api/src/main/java/org/drools/ansible/rulebook/integration/api/domain/Rule.java
@@ -21,6 +21,8 @@ public class Rule {
 
     private final RuleGenerationContext ruleGenerationContext = new RuleGenerationContext();
 
+    private String ruleSetName;
+
     private String name;
 
     private Action action;
@@ -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;
     }
diff --git a/drools-ansible-rulebook-integration-api/src/main/java/org/drools/ansible/rulebook/integration/api/domain/RuleGenerationContext.java b/drools-ansible-rulebook-integration-api/src/main/java/org/drools/ansible/rulebook/integration/api/domain/RuleGenerationContext.java
index 577a1693..51c4fb75 100644
--- a/drools-ansible-rulebook-integration-api/src/main/java/org/drools/ansible/rulebook/integration/api/domain/RuleGenerationContext.java
+++ b/drools-ansible-rulebook-integration-api/src/main/java/org/drools/ansible/rulebook/integration/api/domain/RuleGenerationContext.java
@@ -224,8 +224,7 @@ 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);
@@ -233,14 +232,15 @@ List<Rule> toExecModelRules(RulesSet rulesSet, org.drools.ansible.rulebook.integ
 	    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());
+        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<>();
diff --git a/drools-ansible-rulebook-integration-api/src/main/java/org/drools/ansible/rulebook/integration/api/domain/RulesSet.java b/drools-ansible-rulebook-integration-api/src/main/java/org/drools/ansible/rulebook/integration/api/domain/RulesSet.java
index 4606d6c9..a3043539 100644
--- a/drools-ansible-rulebook-integration-api/src/main/java/org/drools/ansible/rulebook/integration/api/domain/RulesSet.java
+++ b/drools-ansible-rulebook-integration-api/src/main/java/org/drools/ansible/rulebook/integration/api/domain/RulesSet.java
@@ -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() {