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.

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

[incubator-kie-issues#1742] DMN: B-FEEL implementation #6213

Merged
merged 23 commits into from
Jan 20, 2025
Merged
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
18c116c
[incubator-kie-issues#1659] Implemented FEELBuilder. Removing FEEL st…
May 8, 2024
b08b4f7
[incubator-kie-issues#1187] Split EvalHelper
May 10, 2024
dabebc4
Merge remote-tracking branch 'origin/main' into private-bamoe-issues#…
May 13, 2024
691347d
[private-bamoe-issues#1659] WIP - working compilation.
May 13, 2024
cdacd5b
[private-bamoe-issues#1659] WIP - working compilation. Put on hold fo…
May 14, 2024
b5b7d55
Merge remote-tracking branch 'origin/main' into private-bamoe-issues#…
Jun 25, 2024
1315b48
[private-bamoe-issues#1659] Implementing B-FEEL - overall working. Su…
Jun 27, 2024
ca9dbbc
Merge remote-tracking branch 'origin/main' into incubator-kie-issues#…
Jan 8, 2025
6454b4d
[incubator-kie-issues#1742] Working status - compilation and tests su…
Jan 8, 2025
70c7668
[incubator-kie-issues#1742] Fixed as per PR suggestion
Jan 8, 2025
8912aeb
[incubator-kie-issues#1742] Extend test coverage
Jan 8, 2025
b9de803
[incubator-kie-issues#1742] WIP
Jan 8, 2025
938bfa2
[incubator-kie-issues#1742] Fixing headers
Jan 9, 2025
fd7ff21
[incubator-kie-issues#1742] WIP
Jan 9, 2025
18b8565
[incubator-kie-issues#1742] Implemented BFEEL local override management
Jan 14, 2025
3232bd2
[incubator-kie-issues#1742] Removing duplicated decision/assertions
Jan 15, 2025
539c513
[incubator-kie-issues#1742] Moving/renaming/testing "equal" method to…
Jan 15, 2025
0f0704e
[incubator-kie-issues#1742] Extending BFEEL paradigm to all functions.
Jan 15, 2025
b0e007b
[incubator-kie-issues#1742] Fixed as per PR review
Jan 16, 2025
a7d37d4
[incubator-kie-issues#1742] Fixing license header
Jan 16, 2025
af9718d
[incubator-kie-issues#1742] Fixed as per PR review
Jan 17, 2025
9c37f80
[incubator-kie-issues#1742] Fixed as per PR review
Jan 17, 2025
ff85844
[incubator-kie-issues#1742] Fixed as per PR review
Jan 20, 2025
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
Prev Previous commit
Next Next commit
[incubator-kie-issues#1187] Split EvalHelper
Gabriele-Cardosi committed May 10, 2024
commit b08b4f7f5939558e102561bfbb93d68fc6f3141e
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@
import javax.script.ScriptException;

import org.kie.dmn.feel.runtime.FEELFunction;
import org.kie.dmn.feel.util.EvalHelper;
import org.kie.dmn.feel.util.NumberEvalHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@@ -62,7 +62,7 @@ public Object eval(Map<String, Object> ins) throws ScriptException {
Bindings engineScope = createBindings(ins);
Object result = scriptEngine.eval(expression, engineScope);
LOG.debug("Script eval of '{}' result: {}", expression, result);
return EvalHelper.coerceNumber(result);
return NumberEvalHelper.coerceNumber(result);
}

/**
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@
import org.kie.dmn.core.compiler.DMNFEELHelper;
import org.kie.dmn.feel.lang.Type;
import org.kie.dmn.feel.runtime.UnaryTest;
import org.kie.dmn.feel.util.EvalHelper;
import org.kie.dmn.feel.util.NumberEvalHelper;

/**
* @see DMNType
@@ -190,7 +190,7 @@ private boolean valueMatchesInUnaryTests(List<UnaryTest> unaryTests, Object o)
if ( unaryTests == null || unaryTests.isEmpty() ) {
return true;
} else {
return DMNFEELHelper.valueMatchesInUnaryTests(unaryTests, EvalHelper.coerceNumber(o), null);
return DMNFEELHelper.valueMatchesInUnaryTests(unaryTests, NumberEvalHelper.coerceNumber(o), null);
}
}

Original file line number Diff line number Diff line change
@@ -32,6 +32,7 @@
import org.kie.dmn.feel.lang.types.GenListType;
import org.kie.dmn.feel.util.EvalHelper;
import org.kie.dmn.feel.util.EvalHelper.PropertyValueResult;
import org.kie.dmn.feel.util.NumberEvalHelper;

/**
* @see DMNType
@@ -120,7 +121,7 @@ protected boolean internalIsInstanceOf(Object o) {
} catch ( IllegalAccessException | IllegalArgumentException | InvocationTargetException e ) {
return false;
}
Object fieldValue = EvalHelper.coerceNumber( invoked );
Object fieldValue = NumberEvalHelper.coerceNumber(invoked );
if ( !f.getValue().isInstanceOf( fieldValue ) ) {
return false;
}
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@
import org.kie.dmn.feel.runtime.functions.DateFunction;
import org.kie.dmn.feel.runtime.functions.DurationFunction;
import org.kie.dmn.feel.runtime.functions.TimeFunction;
import org.kie.dmn.feel.util.EvalHelper;
import org.kie.dmn.feel.util.NumberEvalHelper;
import org.kie.dmn.typesafe.DMNTypeUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -190,7 +190,7 @@ private Object getAsFEELBuiltinType(Object value, DMNType resultType) {
case BOOLEAN:
return value;
case NUMBER:
return EvalHelper.getBigDecimalOrNull(value);
return NumberEvalHelper.getBigDecimalOrNull(value);
case STRING:
return value;
case DURATION:
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@
import org.kie.dmn.core.impl.DMNResultImpl;
import org.kie.dmn.core.util.Msg;
import org.kie.dmn.core.util.MsgUtil;
import org.kie.dmn.feel.util.EvalHelper;
import org.kie.dmn.feel.util.NumberEvalHelper;
import org.kie.dmn.model.api.DMNElement;
import org.kie.efesto.common.api.identifiers.LocalUri;
import org.kie.efesto.common.api.identifiers.ModelLocalUriId;
@@ -105,7 +105,7 @@ protected Map<String, Object> getPredictedValues(PMML4Result pmml4Result, DMNRes
Map<String, Object> toReturn = new HashMap<>();
String resultName = pmml4Result.getResultObjectName();
Object value = pmml4Result.getResultVariables().get(resultName);
toReturn.put(resultName, EvalHelper.coerceNumber(value));
toReturn.put(resultName, NumberEvalHelper.coerceNumber(value));
return toReturn;
}

@@ -114,7 +114,7 @@ private void populateWithObject(Map<String, Object> toPopulate, String resultNam
if (outputFieldNameFromInfo.isPresent()) {
String name = outputFieldNameFromInfo.get();
try {
toPopulate.put(name, EvalHelper.coerceNumber(r));
toPopulate.put(name, NumberEvalHelper.coerceNumber(r));
} catch (Exception e) {
MsgUtil.reportMessage(LOG,
DMNMessage.Severity.WARN,
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@
import org.kie.dmn.api.core.DMNType;
import org.kie.dmn.core.impl.SimpleTypeImpl;
import org.kie.dmn.feel.lang.types.BuiltInType;
import org.kie.dmn.feel.util.EvalHelper;
import org.kie.dmn.feel.util.DateTimeEvalHelper;

/**
* Class used to centralize all coercion-related behavior
@@ -51,7 +51,7 @@ static Object actualCoerceValue(DMNType requiredType, Object valueToCoerce) {
if (valueToCoerce instanceof LocalDate localDate &&
requiredType instanceof SimpleTypeImpl simpleType &&
simpleType.getFeelType() == BuiltInType.DATE_TIME) {
return EvalHelper.coerceDateTime(localDate);
return DateTimeEvalHelper.coerceDateTime(localDate);
}
return toReturn;
}
Original file line number Diff line number Diff line change
@@ -41,7 +41,6 @@
import java.util.stream.Collectors;

import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
@@ -74,7 +73,7 @@
import org.kie.dmn.feel.lang.types.BuiltInType;
import org.kie.dmn.feel.lang.types.impl.ComparablePeriod;
import org.kie.dmn.feel.marshaller.FEELStringMarshaller;
import org.kie.dmn.feel.util.EvalHelper;
import org.kie.dmn.feel.util.NumberEvalHelper;
import org.kie.dmn.model.api.Decision;
import org.kie.dmn.model.api.Definitions;
import org.kie.dmn.model.api.ItemDefinition;
@@ -1543,8 +1542,8 @@ void typeInferenceForNestedContextAnonymousEntry(boolean useExecModelCompiler) {
final DMNContext result = dmnResult.getContext();

assertThat(dmnResult.hasErrors()).as(DMNRuntimeUtil.formatMessages(dmnResult.getMessages())).isFalse();
assertThat( (List<?>)result.get("My Decision")).asList().containsExactly( prototype( entry("Full Name", "Prof. John Doe"), entry("Age", EvalHelper.coerceNumber(33)) ),
prototype( entry("Full Name", "Prof. 47"), entry("Age", EvalHelper.coerceNumber(47))));
assertThat( (List<?>)result.get("My Decision")).asList().containsExactly( prototype( entry("Full Name", "Prof. John Doe"), entry("Age", NumberEvalHelper.coerceNumber(33)) ),
prototype( entry("Full Name", "Prof. 47"), entry("Age", NumberEvalHelper.coerceNumber(47))));
}

@ParameterizedTest
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
import org.kie.dmn.feel.runtime.functions.BaseFEELFunction;
import org.kie.dmn.feel.runtime.functions.FEELFnResult;
import org.kie.dmn.feel.runtime.functions.ParameterName;
import org.kie.dmn.feel.util.EvalHelper;
import org.kie.dmn.feel.util.NumberEvalHelper;

public class Just47Function extends BaseFEELFunction {

@@ -31,7 +31,7 @@ public Just47Function() {
}

public FEELFnResult<Object> invoke(@ParameterName("ctx") EvaluationContext ctx) {
return FEELFnResult.ofResult(EvalHelper.coerceNumber(47));
return FEELFnResult.ofResult(NumberEvalHelper.coerceNumber(47));
}

@Override
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@
import org.kie.dmn.api.core.DMNResult;
import org.kie.dmn.api.core.DMNRuntime;
import org.kie.dmn.api.core.event.DMNRuntimeEventManager;
import org.kie.dmn.feel.util.EvalHelper;
import org.kie.dmn.feel.util.NumberEvalHelper;
import org.kie.dmn.model.api.DMNElement;
import org.kie.efesto.common.api.model.GeneratedResources;
import org.mockito.Mockito;
@@ -112,7 +112,7 @@ void getOutputFieldValues() {
resultVariables.forEach((s, value) -> {
assertThat(retrieved).containsKey(s);
Object retObject = retrieved.get(s);
Object expected = EvalHelper.coerceNumber(value);
Object expected = NumberEvalHelper.coerceNumber(value);
assertThat(retObject).isEqualTo(expected);
});
}
@@ -125,7 +125,7 @@ void getPredictedValues() {
Map<String, Object> retrieved = dmnKiePMMLTrustyInvocationEvaluator.getPredictedValues(result, null);
assertThat(retrieved).containsKey(result.getResultObjectName());
Object retObject = retrieved.get(result.getResultObjectName());
Object expected = EvalHelper.coerceNumber(value);
Object expected = NumberEvalHelper.coerceNumber(value);
assertThat(retObject).isEqualTo(expected);
});
}
Original file line number Diff line number Diff line change
@@ -33,7 +33,6 @@

import com.fasterxml.jackson.databind.json.JsonMapper;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import org.kie.dmn.api.core.DMNContext;
@@ -50,15 +49,15 @@
import org.kie.dmn.core.v1_2.DMNDecisionServicesTest;
import org.kie.dmn.feel.lang.types.impl.ComparablePeriod;
import org.kie.dmn.feel.runtime.FEELFunction;
import org.kie.dmn.feel.util.EvalHelper;
import org.kie.dmn.feel.util.NumberEvalHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import static org.assertj.core.api.Assertions.assertThat;
import static org.kie.dmn.core.util.DynamicTypeUtils.entry;
import static org.kie.dmn.core.util.DynamicTypeUtils.mapOf;
import static org.kie.dmn.core.util.DynamicTypeUtils.prototype;
import static org.kie.dmn.feel.util.EvalHelper.coerceNumber;
import static org.kie.dmn.feel.util.NumberEvalHelper.coerceNumber;

public class DMNRuntimeTypesTest extends BaseVariantTest {

@@ -606,11 +605,11 @@ void capitalLetterConflict(VariantTestConf conf) {
FEELPropertyAccessible myPersonOut = (FEELPropertyAccessible) allProperties.get("myPerson");
assertThat(myPersonOut.getClass().getSimpleName()).isEqualTo("TPerson");
assertThat(myPersonOut.getFEELProperty("name").toOptional().get()).isEqualTo("John");
assertThat(EvalHelper.coerceNumber(myPersonOut.getFEELProperty("age").toOptional().get())).isEqualTo(EvalHelper.coerceNumber(28));
assertThat(NumberEvalHelper.coerceNumber(myPersonOut.getFEELProperty("age").toOptional().get())).isEqualTo(NumberEvalHelper.coerceNumber(28));
FEELPropertyAccessible myPersonCapitalOut = (FEELPropertyAccessible) allProperties.get("MyPerson");
assertThat(myPersonCapitalOut.getClass().getSimpleName()).isEqualTo("TPerson");
assertThat(myPersonCapitalOut.getFEELProperty("name").toOptional().get()).isEqualTo("Paul");
assertThat(EvalHelper.coerceNumber(myPersonCapitalOut.getFEELProperty("age").toOptional().get())).isEqualTo(EvalHelper.coerceNumber(26));
assertThat(NumberEvalHelper.coerceNumber(myPersonCapitalOut.getFEELProperty("age").toOptional().get())).isEqualTo(NumberEvalHelper.coerceNumber(26));
Object myDecision = allProperties.get("myDecision");
assertThat(myDecision).isEqualTo("myDecision is John");
Object myDecisionCapital = allProperties.get("MyDecision");
@@ -644,7 +643,7 @@ void capitalLetterConflictWithInputAndDecision(VariantTestConf conf) {
FEELPropertyAccessible myPersonOut = (FEELPropertyAccessible) allProperties.get("myNode");
assertThat(myPersonOut.getClass().getSimpleName()).isEqualTo("TPerson");
assertThat(myPersonOut.getFEELProperty("name").toOptional().get()).isEqualTo("John");
assertThat(EvalHelper.coerceNumber(myPersonOut.getFEELProperty("age").toOptional().get())).isEqualTo(EvalHelper.coerceNumber(28));
assertThat(NumberEvalHelper.coerceNumber(myPersonOut.getFEELProperty("age").toOptional().get())).isEqualTo(NumberEvalHelper.coerceNumber(28));
Object myDecision = allProperties.get("MyNode");
assertThat(myDecision).isEqualTo("MyNode is John");
}
@@ -746,13 +745,13 @@ void topLevelTypeCollection(VariantTestConf conf) {
FEELPropertyAccessible person1 = personList.get(0);
FEELPropertyAccessible person2 = personList.get(1);
assertThat(person1.getFEELProperty("Full Name").toOptional().get()).isIn("Prof. John Doe", "Prof. 47");
assertThat(person1.getFEELProperty("Age").toOptional().get()).isIn(EvalHelper.coerceNumber(33), EvalHelper.coerceNumber(47));
assertThat(person1.getFEELProperty("Age").toOptional().get()).isIn(NumberEvalHelper.coerceNumber(33), NumberEvalHelper.coerceNumber(47));
assertThat(person2.getFEELProperty("Full Name").toOptional().get()).isIn("Prof. John Doe", "Prof. 47");
assertThat(person2.getFEELProperty("Age").toOptional().get()).isIn(EvalHelper.coerceNumber(33), EvalHelper.coerceNumber(47));
assertThat(person2.getFEELProperty("Age").toOptional().get()).isIn(NumberEvalHelper.coerceNumber(33), NumberEvalHelper.coerceNumber(47));
} else {
assertThat((List<?>) dmnResult.getContext().get("My Decision")).asList().
contains(prototype(entry("Full Name", "Prof. John Doe"), entry("Age", EvalHelper.coerceNumber(33))),
prototype(entry("Full Name", "Prof. 47"), entry("Age", EvalHelper.coerceNumber(47))));
contains(prototype(entry("Full Name", "Prof. John Doe"), entry("Age", NumberEvalHelper.coerceNumber(33))),
prototype(entry("Full Name", "Prof. 47"), entry("Age", NumberEvalHelper.coerceNumber(47))));
}
}

@@ -784,13 +783,13 @@ void topLevelCompositeCollection(VariantTestConf conf) {
FEELPropertyAccessible pair1 = pairList.get(0);
FEELPropertyAccessible pair2 = pairList.get(1);
assertThat(pair1.getFEELProperty("letter").toOptional().get()).isIn("ABC", "DEF");
assertThat(pair1.getFEELProperty("num").toOptional().get()).isIn(EvalHelper.coerceNumber(123), EvalHelper.coerceNumber(456));
assertThat(pair1.getFEELProperty("num").toOptional().get()).isIn(NumberEvalHelper.coerceNumber(123), NumberEvalHelper.coerceNumber(456));
assertThat(pair2.getFEELProperty("letter").toOptional().get()).isIn("ABC", "DEF");
assertThat(pair2.getFEELProperty("num").toOptional().get()).isIn(EvalHelper.coerceNumber(123), EvalHelper.coerceNumber(456));
assertThat(pair2.getFEELProperty("num").toOptional().get()).isIn(NumberEvalHelper.coerceNumber(123), NumberEvalHelper.coerceNumber(456));
} else {
assertThat((List<?>) dmnResult.getContext().get("Decision-1")).asList().
contains(mapOf(entry("letter", "ABC"), entry("num", EvalHelper.coerceNumber(123))),
mapOf(entry("letter", "DEF"), entry("num", EvalHelper.coerceNumber(456))));
contains(mapOf(entry("letter", "ABC"), entry("num", NumberEvalHelper.coerceNumber(123))),
mapOf(entry("letter", "DEF"), entry("num", NumberEvalHelper.coerceNumber(456))));
}
}

@@ -913,13 +912,13 @@ void evaluateByIdAndName(VariantTestConf conf) {
FEELPropertyAccessible person = (FEELPropertyAccessible)allProperties.get("Decision-1");
assertThat(person.getClass().getSimpleName()).isEqualTo("TPerson");
assertThat(person.getFEELProperty("name").toOptional().get()).isEqualTo("Paul");
assertThat(person.getFEELProperty("age").toOptional().get()).isEqualTo(EvalHelper.coerceNumber(28));
assertThat(person.getFEELProperty("age").toOptional().get()).isEqualTo(NumberEvalHelper.coerceNumber(28));

assertThat(allProperties.get("Decision-2")).isNull();
} else {
Map<String, Object> person = (Map<String, Object>)dmnResult1.getContext().get("Decision-1");
assertThat(person.get("name")).isEqualTo("Paul");
assertThat(person.get("age")).isEqualTo(EvalHelper.coerceNumber(28));
assertThat(person.get("age")).isEqualTo(NumberEvalHelper.coerceNumber(28));

assertThat(dmnResult1.getContext().get("Decision-2")).isNull();
}
@@ -934,13 +933,13 @@ void evaluateByIdAndName(VariantTestConf conf) {
FEELPropertyAccessible person = (FEELPropertyAccessible)allProperties.get("Decision-2");
assertThat(person.getClass().getSimpleName()).isEqualTo("TPerson");
assertThat(person.getFEELProperty("name").toOptional().get()).isEqualTo("George");
assertThat(person.getFEELProperty("age").toOptional().get()).isEqualTo(EvalHelper.coerceNumber(27));
assertThat(person.getFEELProperty("age").toOptional().get()).isEqualTo(NumberEvalHelper.coerceNumber(27));

assertThat(allProperties.get("Decision-1")).isNull();
} else {
Map<String, Object> person = (Map<String, Object>)dmnResult2.getContext().get("Decision-2");
assertThat(person.get("name")).isEqualTo("George");
assertThat(person.get("age")).isEqualTo(EvalHelper.coerceNumber(27));
assertThat(person.get("age")).isEqualTo(NumberEvalHelper.coerceNumber(27));

assertThat(dmnResult2.getContext().get("Decision-1")).isNull();
}
Original file line number Diff line number Diff line change
@@ -90,8 +90,8 @@
import org.kie.dmn.feel.lang.impl.MapBackedType;
import org.kie.dmn.feel.lang.types.BuiltInType;
import org.kie.dmn.feel.parser.feel11.ScopeHelper;
import org.kie.dmn.feel.util.EvalHelper;
import org.kie.dmn.feel.util.Msg;
import org.kie.dmn.feel.util.StringEvalHelper;

import static org.kie.dmn.feel.codegen.feel11.DirectCompilerResult.mergeFDs;

@@ -181,13 +181,13 @@ public DirectCompilerResult visit(NullNode n) {

@Override
public DirectCompilerResult visit(NameDefNode n) {
StringLiteralExpr expr = Expressions.stringLiteral(EvalHelper.normalizeVariableName(n.getText()));
StringLiteralExpr expr = Expressions.stringLiteral(StringEvalHelper.normalizeVariableName(n.getText()));
return DirectCompilerResult.of(expr, BuiltInType.STRING);
}

@Override
public DirectCompilerResult visit(NameRefNode n) {
String nameRef = EvalHelper.normalizeVariableName(n.getText());
String nameRef = StringEvalHelper.normalizeVariableName(n.getText());
Type type = scopeHelper.resolve(nameRef).orElse(BuiltInType.UNKNOWN);
return DirectCompilerResult.of(FeelCtx.getValue(nameRef), type);
}
Loading