[1.0.x] Align drools 9.101.x prod (#116)

* Bump to 1.0.7-SNAPSHOT * [KIE-792] refactor prototypes in their own module (#97) * [KIE-792] refactor prototypes in their own module * use new prototype API * get rid of fact templates * Bump drools 8.43.0.Final to 9.101.0 --------- Co-authored-by: Mario Fusco <[email protected]>
kiegroup · Oct 6, 2024 · ad8e327 · ad8e327
1 parent c27f4f1
commit ad8e327
Show file tree

Hide file tree

Showing 53 changed files with 334 additions and 338 deletions.
diff --git a/drools-ansible-rulebook-integration-api/pom.xml b/drools-ansible-rulebook-integration-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>drools-ansible-rulebook-integration</artifactId>
     <groupId>org.drools</groupId>
-    <version>1.0.6-SNAPSHOT</version>
+    <version>1.0.7-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/...egration-api/src/main/java/org/drools/ansible/rulebook/integration/api/RulesExecutor.java b/...egration-api/src/main/java/org/drools/ansible/rulebook/integration/api/RulesExecutor.java
@@ -4,7 +4,7 @@
 import org.drools.ansible.rulebook.integration.api.rulesengine.RulesEvaluator;
 import org.drools.ansible.rulebook.integration.api.rulesengine.RulesExecutorSession;
 import org.drools.ansible.rulebook.integration.api.rulesengine.SessionStats;
-import org.drools.base.facttemplates.Fact;
+import org.kie.api.prototype.PrototypeFactInstance;
 import org.kie.api.runtime.KieSession;
 import org.kie.api.runtime.rule.Match;
 import org.slf4j.Logger;
@@ -90,7 +90,7 @@ public Collection<?> getAllFacts() {
     }
 
     public List<Map<String, Object>> getAllFactsAsMap() {
-        return getAllFacts().stream().map(Fact.class::cast).map(Fact::asMap).collect(Collectors.toList());
+        return getAllFacts().stream().map(PrototypeFactInstance.class::cast).map(PrototypeFactInstance::asMap).collect(Collectors.toList());
     }
 
     public String getAllFactsAsJson() {

diff --git a/...c/main/java/org/drools/ansible/rulebook/integration/api/domain/RuleGenerationContext.java b/...c/main/java/org/drools/ansible/rulebook/integration/api/domain/RuleGenerationContext.java
@@ -1,36 +1,37 @@
 package org.drools.ansible.rulebook.integration.api.domain;
 
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Deque;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Function;
-
 import org.drools.ansible.rulebook.integration.api.RuleConfigurationOption;
 import org.drools.ansible.rulebook.integration.api.RuleConfigurationOptions;
 import org.drools.ansible.rulebook.integration.api.domain.actions.Action;
 import org.drools.ansible.rulebook.integration.api.domain.conditions.Condition;
 import org.drools.ansible.rulebook.integration.api.domain.temporal.TimeConstraint;
 import org.drools.ansible.rulebook.integration.api.rulesengine.RulesExecutionController;
 import org.drools.model.Drools;
-import org.drools.model.PrototypeDSL;
-import org.drools.model.PrototypeVariable;
 import org.drools.model.Rule;
 import org.drools.model.RuleItemBuilder;
 import org.drools.model.Variable;
+import org.drools.model.prototype.PrototypeDSL;
+import org.drools.model.prototype.PrototypeVariable;
 import org.drools.model.view.ViewItem;
 
-import static org.drools.ansible.rulebook.integration.api.rulesmodel.PrototypeFactory.getPrototype;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Function;
+
+import static org.drools.ansible.rulebook.integration.api.rulesmodel.PrototypeFactory.getPrototypeEvent;
+import static org.drools.ansible.rulebook.integration.api.rulesmodel.PrototypeFactory.getPrototypeFact;
 import static org.drools.model.DSL.execute;
 import static org.drools.model.DSL.on;
 import static org.drools.model.PatternDSL.rule;
-import static org.drools.model.PrototypeDSL.protoPattern;
-import static org.drools.model.PrototypeDSL.variable;
+import static org.drools.model.prototype.PrototypeDSL.protoPattern;
+import static org.drools.model.prototype.PrototypeDSL.variable;
 
 public class RuleGenerationContext {
 
@@ -72,8 +73,8 @@ public void addOptions(Iterable<RuleConfigurationOption> options) {
         this.options.addOptions(options);
     }
 
-    public PrototypeDSL.PrototypePatternDef getOrCreatePattern(String binding, String name) {
-        return patterns.computeIfAbsent(binding, b -> protoPattern(variable(getPrototype(name), b)));
+    public PrototypeDSL.PrototypePatternDef getOrCreatePattern(String binding, String name, boolean event) {
+        return patterns.computeIfAbsent(binding, b -> protoPattern(variable(event ? getPrototypeEvent(name) : getPrototypeFact(name), b)));
     }
 
     public PrototypeVariable getPatternVariable(String binding) {

diff --git a/...main/java/org/drools/ansible/rulebook/integration/api/domain/conditions/AstCondition.java b/...main/java/org/drools/ansible/rulebook/integration/api/domain/conditions/AstCondition.java
@@ -1,17 +1,17 @@
 package org.drools.ansible.rulebook.integration.api.domain.conditions;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.drools.ansible.rulebook.integration.api.domain.RuleGenerationContext;
 import org.drools.ansible.rulebook.integration.api.domain.temporal.OnceWithinDefinition;
 import org.drools.ansible.rulebook.integration.api.rulesmodel.ParsedCondition;
 import org.drools.model.Index;
-import org.drools.model.PrototypeDSL;
-import org.drools.model.PrototypeExpression;
+import org.drools.model.prototype.PrototypeDSL;
+import org.drools.model.prototype.PrototypeExpression;
 import org.drools.model.view.CombinedExprViewItem;
 import org.drools.model.view.ViewItem;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import static org.drools.ansible.rulebook.integration.api.rulesmodel.PrototypeFactory.DEFAULT_PROTOTYPE_NAME;
 
 public class AstCondition implements Condition {
@@ -145,7 +145,7 @@ protected PrototypeDSL.PrototypePatternDef getPattern(RuleGenerationContext rule
 
         protected PrototypeDSL.PrototypePatternDef getPattern(RuleGenerationContext ruleContext, String binding) {
             if (pattern == null) {
-                pattern = ruleContext.getOrCreatePattern(binding, DEFAULT_PROTOTYPE_NAME);
+                pattern = ruleContext.getOrCreatePattern(binding, DEFAULT_PROTOTYPE_NAME, ruleContext.getTimeConstraint().isPresent());
             }
             return pattern;
         }
@@ -273,7 +273,7 @@ SingleCondition withPatternBinding(RuleGenerationContext ruleContext, String pat
             if (parent != null) {
                 parent.beforeBinding();
             }
-            this.pattern = ruleContext.getOrCreatePattern(patternBinding, DEFAULT_PROTOTYPE_NAME);
+            this.pattern = ruleContext.getOrCreatePattern(patternBinding, DEFAULT_PROTOTYPE_NAME, ruleContext.getTimeConstraint().isPresent());
             if (parent != null) {
                 parent.afterBinding();
             }

diff --git a/...rc/main/java/org/drools/ansible/rulebook/integration/api/domain/conditions/Condition.java b/...rc/main/java/org/drools/ansible/rulebook/integration/api/domain/conditions/Condition.java
@@ -1,8 +1,7 @@
 package org.drools.ansible.rulebook.integration.api.domain.conditions;
 
-import org.drools.model.PrototypeDSL;
-import org.drools.model.view.ViewItem;
 import org.drools.ansible.rulebook.integration.api.domain.RuleGenerationContext;
+import org.drools.model.view.ViewItem;
 
 public interface Condition {
     ViewItem toPattern(RuleGenerationContext ruleContext);

diff --git a/...va/org/drools/ansible/rulebook/integration/api/domain/conditions/ConditionExpression.java b/...va/org/drools/ansible/rulebook/integration/api/domain/conditions/ConditionExpression.java
@@ -1,23 +1,20 @@
 package org.drools.ansible.rulebook.integration.api.domain.conditions;
 
+import org.drools.ansible.rulebook.integration.api.domain.RuleGenerationContext;
+import org.drools.ansible.rulebook.integration.protoextractor.prototype.ExtractorPrototypeExpressionUtils;
+import org.drools.model.prototype.PrototypeDSL;
+import org.drools.model.prototype.PrototypeExpression;
+import org.drools.model.prototype.PrototypeVariable;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
-import org.drools.ansible.rulebook.integration.api.domain.RuleGenerationContext;
-import org.drools.ansible.rulebook.integration.protoextractor.prototype.ExtractorPrototypeExpression;
-import org.drools.ansible.rulebook.integration.protoextractor.prototype.ExtractorPrototypeExpressionUtils;
-import org.drools.model.PrototypeDSL;
-import org.drools.model.PrototypeExpression;
-import org.drools.model.PrototypeVariable;
-
 import static org.drools.ansible.rulebook.integration.api.domain.conditions.ConditionParseUtil.isEventOrFact;
 import static org.drools.ansible.rulebook.integration.api.domain.conditions.ConditionParseUtil.isKnownType;
 import static org.drools.ansible.rulebook.integration.api.domain.conditions.ConditionParseUtil.toJsonValue;
-import static org.drools.model.PrototypeDSL.fieldName2PrototypeExpression;
-import static org.drools.model.PrototypeExpression.fixedValue;
-import static org.drools.model.PrototypeExpression.prototypeField;
+import static org.drools.model.prototype.PrototypeExpression.fixedValue;
 
 public class ConditionExpression {
 

diff --git a/...ava/org/drools/ansible/rulebook/integration/api/domain/conditions/ConditionParseUtil.java b/...ava/org/drools/ansible/rulebook/integration/api/domain/conditions/ConditionParseUtil.java
@@ -1,13 +1,13 @@
 package org.drools.ansible.rulebook.integration.api.domain.conditions;
 
+import org.drools.ansible.rulebook.integration.api.io.JsonMapper;
+import org.kie.api.prototype.Prototype;
+
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.drools.ansible.rulebook.integration.api.io.JsonMapper;
-import org.drools.model.Prototype;
-
 public class ConditionParseUtil {
 
     private static final Set<String> KNOWN_TYPES = Set.of("Integer", "Float", "String", "Boolean", "NullType");

diff --git a/...main/java/org/drools/ansible/rulebook/integration/api/domain/conditions/MapCondition.java b/...main/java/org/drools/ansible/rulebook/integration/api/domain/conditions/MapCondition.java
@@ -27,7 +27,7 @@
 
 import static org.drools.ansible.rulebook.integration.api.domain.conditions.ConditionExpression.map2Expr;
 import static org.drools.ansible.rulebook.integration.api.domain.conditions.ConditionExpression.mapEntry2Expr;
-import static org.drools.model.PrototypeExpression.fixedValue;
+import static org.drools.model.prototype.PrototypeExpression.fixedValue;
 
 public class MapCondition implements Condition {
 

diff --git a/...n/java/org/drools/ansible/rulebook/integration/api/domain/conditions/SimpleCondition.java b/...n/java/org/drools/ansible/rulebook/integration/api/domain/conditions/SimpleCondition.java
@@ -1,17 +1,17 @@
 package org.drools.ansible.rulebook.integration.api.domain.conditions;
 
-import java.util.Arrays;
-import java.util.List;
-
+import org.drools.ansible.rulebook.integration.api.domain.RuleGenerationContext;
+import org.drools.ansible.rulebook.integration.api.rulesmodel.ParsedCondition;
 import org.drools.model.Index;
 import org.drools.model.PatternDSL;
-import org.drools.model.PrototypeDSL;
-import org.drools.model.PrototypeExpression;
-import org.drools.model.PrototypeVariable;
+import org.drools.model.prototype.PrototypeDSL;
+import org.drools.model.prototype.PrototypeExpression;
+import org.drools.model.prototype.PrototypeVariable;
 import org.drools.model.view.CombinedExprViewItem;
 import org.drools.model.view.ViewItem;
-import org.drools.ansible.rulebook.integration.api.domain.RuleGenerationContext;
-import org.drools.ansible.rulebook.integration.api.rulesmodel.ParsedCondition;
+
+import java.util.Arrays;
+import java.util.List;
 
 import static org.drools.ansible.rulebook.integration.api.rulesmodel.PrototypeFactory.DEFAULT_PROTOTYPE_NAME;
 
@@ -212,7 +212,7 @@ private static ViewItem scopingCondition2Pattern(RuleGenerationContext ruleConte
 
     private static ViewItem singleCondition2Pattern(RuleGenerationContext ruleContext, SimpleCondition condition) {
         ParsedCondition parsedCondition = condition.parse();
-        var pattern = ruleContext.getOrCreatePattern(condition.getPatternBinding(ruleContext), DEFAULT_PROTOTYPE_NAME);
+        var pattern = ruleContext.getOrCreatePattern(condition.getPatternBinding(ruleContext), DEFAULT_PROTOTYPE_NAME, ruleContext.getTimeConstraint().isPresent());
         if (condition.beta()) {
             pattern.expr(parsedCondition.getLeft(), parsedCondition.getOperator(), ruleContext.getPatternVariable(condition.otherBinding()), parsedCondition.getRight());
         } else {

diff --git a/...main/java/org/drools/ansible/rulebook/integration/api/domain/constraints/ExistsField.java b/...main/java/org/drools/ansible/rulebook/integration/api/domain/constraints/ExistsField.java
@@ -2,13 +2,13 @@
 
 import org.drools.ansible.rulebook.integration.api.domain.RuleGenerationContext;
 import org.drools.ansible.rulebook.integration.api.rulesmodel.ParsedCondition;
-import org.drools.model.Prototype;
+import org.kie.api.prototype.Prototype;
 
 import java.util.Map;
 import java.util.function.BiPredicate;
 
 import static org.drools.ansible.rulebook.integration.api.domain.conditions.ConditionExpression.map2Expr;
-import static org.drools.model.PrototypeExpression.thisPrototype;
+import static org.drools.model.prototype.PrototypeExpression.thisPrototype;
 
 public enum ExistsField implements RulebookOperator, ConditionFactory {
 

diff --git a/...va/org/drools/ansible/rulebook/integration/api/domain/constraints/NegatedExistsField.java b/...va/org/drools/ansible/rulebook/integration/api/domain/constraints/NegatedExistsField.java
@@ -4,18 +4,18 @@
 import org.drools.ansible.rulebook.integration.api.domain.conditions.ConditionExpression;
 import org.drools.ansible.rulebook.integration.api.rulesmodel.ParsedCondition;
 import org.drools.model.functions.Function1;
-import org.drools.model.PrototypeExpression;
-import org.drools.model.PrototypeVariable;
-import org.drools.model.Prototype;
-import org.drools.model.PrototypeFact;
+import org.drools.model.prototype.PrototypeExpression;
+import org.drools.model.prototype.PrototypeVariable;
+import org.kie.api.prototype.Prototype;
+import org.kie.api.prototype.PrototypeFactInstance;
 
 import java.util.Collection;
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.BiPredicate;
 
 import static org.drools.ansible.rulebook.integration.api.domain.conditions.ConditionExpression.map2Expr;
-import static org.drools.model.PrototypeExpression.thisPrototype;
+import static org.drools.model.prototype.PrototypeExpression.thisPrototype;
 
 public enum NegatedExistsField implements RulebookOperator, ConditionFactory {
 
@@ -49,7 +49,7 @@ private PrototypeExpressionWithAdmittedUndefined(PrototypeExpression delegate) {
         }
 
         @Override
-        public Function1<PrototypeFact, Object> asFunction(Prototype prototype) {
+        public Function1<PrototypeFactInstance, Object> asFunction(Prototype prototype) {
             return delegate.asFunction(prototype).andThen( result -> result == Prototype.UNDEFINED_VALUE ? ADMITTED_UNDEFINED_VALUE : result );
         }
 

diff --git a/...g/drools/ansible/rulebook/integration/api/domain/constraints/SearchMatchesConstraint.java b/...g/drools/ansible/rulebook/integration/api/domain/constraints/SearchMatchesConstraint.java
@@ -13,7 +13,7 @@
 
 import static org.drools.ansible.rulebook.integration.api.domain.conditions.ConditionExpression.map2Expr;
 import static org.drools.ansible.rulebook.integration.api.domain.conditions.ConditionParseUtil.isRegexOperator;
-import static org.drools.model.PrototypeExpression.fixedValue;
+import static org.drools.model.prototype.PrototypeExpression.fixedValue;
 
 public enum SearchMatchesConstraint implements RulebookOperator, ConditionFactory {
 

diff --git a/.../org/drools/ansible/rulebook/integration/api/domain/constraints/SelectAttrConstraint.java b/.../org/drools/ansible/rulebook/integration/api/domain/constraints/SelectAttrConstraint.java
@@ -4,7 +4,7 @@
 import org.drools.ansible.rulebook.integration.api.domain.conditions.ConditionExpression;
 import org.drools.ansible.rulebook.integration.api.rulesmodel.ParsedCondition;
 import org.drools.model.ConstraintOperator;
-import org.drools.model.Prototype;
+import org.kie.api.prototype.Prototype;
 
 import java.util.Collection;
 import java.util.Map;
@@ -16,7 +16,7 @@
 import static org.drools.ansible.rulebook.integration.api.domain.conditions.ConditionParseUtil.mapToStringValue;
 import static org.drools.ansible.rulebook.integration.api.domain.conditions.ConditionParseUtil.toJsonValue;
 import static org.drools.ansible.rulebook.integration.api.domain.constraints.Operators.toOperatorPredicate;
-import static org.drools.model.PrototypeExpression.fixedValue;
+import static org.drools.model.prototype.PrototypeExpression.fixedValue;
 
 public enum SelectAttrConstraint implements RulebookOperator, ConditionFactory {
 

diff --git a/...java/org/drools/ansible/rulebook/integration/api/domain/constraints/SelectConstraint.java b/...java/org/drools/ansible/rulebook/integration/api/domain/constraints/SelectConstraint.java
@@ -6,9 +6,9 @@
 import org.drools.ansible.rulebook.integration.api.rulesmodel.ParsedCondition;
 import org.drools.ansible.rulebook.integration.protoextractor.prototype.ExtractorPrototypeExpressionUtils;
 import org.drools.model.ConstraintOperator;
-import org.drools.model.Prototype;
-import org.drools.model.PrototypeDSL;
-import org.drools.model.PrototypeVariable;
+import org.drools.model.prototype.PrototypeDSL;
+import org.drools.model.prototype.PrototypeVariable;
+import org.kie.api.prototype.Prototype;
 
 import java.util.Collection;
 import java.util.Map;
@@ -19,7 +19,7 @@
 import static org.drools.ansible.rulebook.integration.api.domain.conditions.ConditionParseUtil.mapToStringValue;
 import static org.drools.ansible.rulebook.integration.api.domain.conditions.ConditionParseUtil.toJsonValue;
 import static org.drools.ansible.rulebook.integration.api.domain.constraints.Operators.toOperatorPredicate;
-import static org.drools.model.PrototypeExpression.fixedValue;
+import static org.drools.model.prototype.PrototypeExpression.fixedValue;
 
 public enum SelectConstraint implements RulebookOperator, ConditionFactory {
 

diff --git a/...g/drools/ansible/rulebook/integration/api/domain/temporal/OnceAbstractTimeConstraint.java b/...g/drools/ansible/rulebook/integration/api/domain/temporal/OnceAbstractTimeConstraint.java
@@ -4,22 +4,19 @@
 import org.drools.ansible.rulebook.integration.protoextractor.ExtractorUtils;
 import org.drools.ansible.rulebook.integration.protoextractor.ast.ExtractorNode;
 import org.drools.ansible.rulebook.integration.protoextractor.prototype.ExtractorPrototypeExpression;
-import org.drools.ansible.rulebook.integration.protoextractor.prototype.ExtractorPrototypeExpressionUtils;
-import org.drools.base.facttemplates.Fact;
 import org.drools.model.Index;
-import org.drools.model.PrototypeDSL;
-import org.drools.model.PrototypeExpression;
-import org.drools.model.PrototypeFact;
-import org.drools.model.PrototypeVariable;
+import org.drools.model.prototype.PrototypeDSL;
+import org.drools.model.prototype.PrototypeExpression;
+import org.drools.model.prototype.PrototypeVariable;
+import org.kie.api.prototype.PrototypeFactInstance;
 
 import java.util.List;
 
 import static org.drools.ansible.rulebook.integration.api.rulesmodel.PrototypeFactory.SYNTHETIC_PROTOTYPE_NAME;
-import static org.drools.ansible.rulebook.integration.api.rulesmodel.PrototypeFactory.getPrototype;
-import static org.drools.model.PrototypeDSL.protoPattern;
-import static org.drools.model.PrototypeDSL.variable;
-import static org.drools.model.PrototypeExpression.fixedValue;
-import static org.drools.model.PrototypeExpression.prototypeField;
+import static org.drools.ansible.rulebook.integration.api.rulesmodel.PrototypeFactory.getPrototypeEvent;
+import static org.drools.model.prototype.PrototypeDSL.protoPattern;
+import static org.drools.model.prototype.PrototypeDSL.variable;
+import static org.drools.model.prototype.PrototypeExpression.prototypeField;
 
 public abstract class OnceAbstractTimeConstraint implements TimeConstraint {
 
@@ -46,7 +43,7 @@ protected PrototypeVariable getControlVariable() {
     }
 
     protected PrototypeDSL.PrototypePatternDef createControlPattern() {
-        PrototypeDSL.PrototypePatternDef controlPattern = protoPattern(variable(getPrototype(SYNTHETIC_PROTOTYPE_NAME)));
+        PrototypeDSL.PrototypePatternDef controlPattern = protoPattern(variable(getPrototypeEvent(SYNTHETIC_PROTOTYPE_NAME)));
         for (GroupByAttribute unique : groupByAttributes) {
             controlPattern.expr( prototypeField(unique.getKey()), // intentional, the control fact has the "group by" key string as-is (not structured), so we reference it for the left part
                     Index.ConstraintType.EQUAL,
@@ -95,11 +92,7 @@ public PrototypeExpression asPrototypeExpression() {
             return new ExtractorPrototypeExpression(extractor);
         }
 
-        public Object evalExtractorOnFact(PrototypeFact fact) {
-            return evalExtractorOnFact((Fact) fact);
-        }
-
-        public Object evalExtractorOnFact(Fact fact) {
+        public Object evalExtractorOnFact(PrototypeFactInstance fact) {
             return ExtractorUtils.getValueFrom(extractor, fact.asMap());
         }