[incubator-kie-issues#1791] Mapping evaluationHit id to belonging dec…

…ision. Introduced "Sample" model
apache · Feb 3, 2025 · 49f5211 · 49f5211
1 parent df59294
commit 49f5211
Show file tree

Hide file tree

Showing 6 changed files with 873 additions and 5 deletions.
diff --git a/...kie-dmn-api/src/main/java/org/kie/dmn/api/core/event/AfterConditionalEvaluationEvent.java b/...kie-dmn-api/src/main/java/org/kie/dmn/api/core/event/AfterConditionalEvaluationEvent.java
@@ -26,6 +26,8 @@
  */
 public interface AfterConditionalEvaluationEvent {
 
+    String getNodeName();
+
     EvaluatorResult getEvaluatorResultResult();
 
     String getExecutedId();

diff --git a/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/ast/DMNConditionalEvaluator.java b/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/ast/DMNConditionalEvaluator.java
@@ -95,7 +95,7 @@ protected EvaluatorResult manageBooleanOrNullIfResult(Boolean booleanResult, DMN
 
         EvaluatorResult toReturn = evaluatorToUse.evaluate(eventManager, result);
         String executedId  = evaluatorIdMap.get(evaluatorToUse);
-        DMNRuntimeEventManagerUtils.fireAfterConditionalEvaluation(eventManager, toReturn, executedId);
+        DMNRuntimeEventManagerUtils.fireAfterConditionalEvaluation(eventManager, name, toReturn, executedId);
         return toReturn;
     }
 

diff --git a/...kie-dmn-core/src/main/java/org/kie/dmn/core/impl/AfterConditionalEvaluationEventImpl.java b/...kie-dmn-core/src/main/java/org/kie/dmn/core/impl/AfterConditionalEvaluationEventImpl.java
@@ -23,14 +23,21 @@
 
 public class AfterConditionalEvaluationEventImpl implements AfterConditionalEvaluationEvent {
 
+    private final String nodeName;
     private final EvaluatorResult evaluatorResult;
     private final String executedId;
 
-    public AfterConditionalEvaluationEventImpl(EvaluatorResult evaluatorResult, String executedId) {
+    public AfterConditionalEvaluationEventImpl(String nodeName, EvaluatorResult evaluatorResult, String executedId) {
+        this.nodeName = nodeName;
         this.evaluatorResult = evaluatorResult;
         this.executedId = executedId;
     }
 
+    @Override
+    public String getNodeName() {
+        return nodeName;
+    }
+
     @Override
     public EvaluatorResult getEvaluatorResultResult() {
         return evaluatorResult;

diff --git a/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/impl/DMNRuntimeEventManagerUtils.java b/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/impl/DMNRuntimeEventManagerUtils.java
@@ -159,9 +159,9 @@ public static void fireAfterEvaluateConditional(DMNRuntimeEventManager eventMana
         }
     }
 
-    public static void fireAfterConditionalEvaluation(DMNRuntimeEventManager eventManager, EvaluatorResult evaluatorResult, String idExecuted) {
+    public static void fireAfterConditionalEvaluation(DMNRuntimeEventManager eventManager, String nodeName, EvaluatorResult evaluatorResult, String idExecuted) {
         if( eventManager.hasListeners() ) {
-            AfterConditionalEvaluationEvent event = new AfterConditionalEvaluationEventImpl(evaluatorResult, idExecuted);
+            AfterConditionalEvaluationEvent event = new AfterConditionalEvaluationEventImpl(nodeName, evaluatorResult, idExecuted);
             notifyListeners(eventManager, l -> l.afterConditionalEvaluation(event));
         }
     }

diff --git a/...dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/impl/DMNRuntimeEventManagerUtilsTest.java b/...dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/impl/DMNRuntimeEventManagerUtilsTest.java
@@ -66,12 +66,14 @@ void fireAfterEvaluateConditional() {
     @Test
     void fireAfterConditionalEvaluation() {
         EvaluatorResult evaluatorResult = mock(EvaluatorResult.class);
+        String name = "NAME";
         String executedId = "EXECUTED_ID";
-        DMNRuntimeEventManagerUtils.fireAfterConditionalEvaluation(eventManagerMock, evaluatorResult, executedId);
+        DMNRuntimeEventManagerUtils.fireAfterConditionalEvaluation(eventManagerMock, name, evaluatorResult, executedId);
         ArgumentCaptor<AfterConditionalEvaluationEvent> conditionalEvaluationEventArgumentCaptor = ArgumentCaptor.forClass(AfterConditionalEvaluationEvent.class);
         verify(spiedListener).afterConditionalEvaluation (conditionalEvaluationEventArgumentCaptor.capture());
         AfterConditionalEvaluationEvent evaluateConditionalEvent = conditionalEvaluationEventArgumentCaptor.getValue();
         assertThat(evaluateConditionalEvent).isNotNull();
+        assertThat(evaluateConditionalEvent.getNodeName()).isEqualTo(name);
         assertThat(evaluateConditionalEvent.getEvaluatorResultResult()).isEqualTo(evaluatorResult);
         assertThat(evaluateConditionalEvent.getExecutedId()).isEqualTo(executedId);
     }