[#754] Add configuration for recursive calls of BKMs

opatrascoiu · opatrascoiu · commit f61c0c29cb4b · 2025-10-03T16:53:26.000+01:00
diff --git a/dmn-core/src/main/java/com/gs/dmn/runtime/interpreter/AbstractDMNInterpreter.java b/dmn-core/src/main/java/com/gs/dmn/runtime/interpreter/AbstractDMNInterpreter.java
@@ -349,9 +349,7 @@ protected DMNContext makeDecisionGlobalContext(DRGElementReference<TDecision> re
     }
 
     private DMNContext makeDecisionGlobalContext(TDRGElement element, Map<QualifiedName, Object> informationRequirements) {
-        // No caching when is not strongly typed, input data types might be inferred from input data
-        boolean strongTyping = dmnTransformer.isStrongTyping();
-        DMNContext globalContext = strongTyping ? this.dmnTransformer.makeGlobalContext(element) : this.dmnTransformer.makeGlobalContext(element, true);
+        DMNContext globalContext = this.dmnTransformer.makeGlobalContext(element);
         for (Map.Entry<QualifiedName, Object> entry: informationRequirements.entrySet()) {
             String key = this.dmnTransformer.bindingName(entry.getKey());
             globalContext.bind(key, entry.getValue());
diff --git a/dmn-core/src/main/java/com/gs/dmn/transformation/InputParameters.java b/dmn-core/src/main/java/com/gs/dmn/transformation/InputParameters.java
@@ -69,6 +69,8 @@ protected static boolean getOptionalBooleanParam(Map<String, String> parameters,
     private final String tckFileExtension;
     private final Charset charset;
 
+    private final boolean recursiveCalls;
+
     private final String javaRootPackage;
     private final boolean onePackage;
     private final boolean singletonInputData;
@@ -110,14 +112,16 @@ public InputParameters(Map<String, String> inputParameters) {
         String charsetName = InputParameters.getOptionalParam(inputParameters, "encoding");
         this.charset = charsetName == null ? StandardCharsets.UTF_8 : Charset.forName(charsetName);
 
+        this.strongTyping = InputParameters.getOptionalBooleanParam(inputParameters, "strongTyping", "true");
+        this.recursiveCalls = InputParameters.getOptionalBooleanParam(inputParameters, "recursiveCalls", "true");
+
         this.javaRootPackage = InputParameters.getOptionalParam(inputParameters, "javaRootPackage");
         this.onePackage = InputParameters.getOptionalBooleanParam(inputParameters, "onePackage", "false");
         this.caching = InputParameters.getOptionalBooleanParam(inputParameters, "caching");
         String cachingThresholdParam = InputParameters.getOptionalParam(inputParameters, "cachingThreshold", "1");
         this.cachingThreshold = Integer.parseInt(cachingThresholdParam);
         this.singletonInputData = InputParameters.getOptionalBooleanParam(inputParameters, "singletonInputData", "true");
         this.singletonDecision = InputParameters.getOptionalBooleanParam(inputParameters, "singletonDecision", "false");
-        this.strongTyping = InputParameters.getOptionalBooleanParam(inputParameters, "strongTyping", "true");
         this.parallelStream = InputParameters.getOptionalBooleanParam(inputParameters, "parallelStream", "false");
         this.generateProtoMessages = InputParameters.getOptionalBooleanParam(inputParameters, "generateProtoMessages", "false");
         this.generateProtoServices = InputParameters.getOptionalBooleanParam(inputParameters, "generateProtoServices", "false");
@@ -177,6 +181,14 @@ public Charset getCharset() {
         return this.charset;
     }
 
+    public boolean isStrongTyping() {
+        return strongTyping;
+    }
+
+    public boolean isRecursiveCalls() {
+        return recursiveCalls;
+    }
+
     public String getJavaRootPackage() {
         return javaRootPackage;
     }
@@ -193,10 +205,6 @@ public boolean isSingletonDecision() {
         return singletonDecision;
     }
 
-    public boolean isStrongTyping() {
-        return strongTyping;
-    }
-
     public boolean isCaching() {
         return caching;
     }
diff --git a/dmn-core/src/main/java/com/gs/dmn/transformation/basic/BasicDMNToJavaTransformer.java b/dmn-core/src/main/java/com/gs/dmn/transformation/basic/BasicDMNToJavaTransformer.java
@@ -2283,6 +2283,11 @@ public String extractMemberFromProtoValue(String protoValue, Type type, boolean
         return this.nativeFactory.extractMemberFromProtoValue(protoValue, type, staticContext);
     }
 
+    @Override
+    public boolean isRecursiveCalls() {
+        return this.inputParameters.isRecursiveCalls();
+    }
+
     //
     // Mock testing related methods
     //
diff --git a/dmn-core/src/main/java/com/gs/dmn/transformation/basic/BasicDMNToNativeTransformer.java b/dmn-core/src/main/java/com/gs/dmn/transformation/basic/BasicDMNToNativeTransformer.java
@@ -635,18 +635,6 @@ default DMNContext makeGlobalContext(TDRGElement element) {
         return globalContext;
     }
 
-    default DMNContext makeGlobalContext(TDRGElement element, boolean isRecursive) {
-        DMNContext libraryContext = makeLibraryContext(element, makeBuiltInContext());
-        DMNContext globalContext = DMNContext.of(
-                libraryContext,
-                DMNContextKind.GLOBAL,
-                element,
-                getDMNEnvironmentFactory().makeEnvironment(element, isRecursive),
-                RuntimeEnvironment.of()
-        );
-        return globalContext;
-    }
-
     default DMNContext makeLibraryContext(TDRGElement element, DMNContext parentContext) {
         // Filter libs
         List<Pair<String, ELLib>> importedLibraries = findImportedLibraries(element);
@@ -846,6 +834,9 @@ default DMNContext makeRelationContext(TDRGElement element, TRelation relation,
         );
     }
 
+    // Supports recursive calls for BKMs
+    boolean isRecursiveCalls();
+
     //
     // Mock testing related methods
     //
diff --git a/dmn-core/src/main/java/com/gs/dmn/transformation/basic/DMNEnvironmentFactory.java b/dmn-core/src/main/java/com/gs/dmn/transformation/basic/DMNEnvironmentFactory.java
@@ -62,8 +62,6 @@ public interface DMNEnvironmentFactory {
     //
     Environment makeEnvironment(TDRGElement element);
 
-    Environment makeEnvironment(TDRGElement element, boolean isRecursive);
-
     //
     // Decision Table
     //
diff --git a/dmn-core/src/main/java/com/gs/dmn/transformation/basic/StandardDMNEnvironmentFactory.java b/dmn-core/src/main/java/com/gs/dmn/transformation/basic/StandardDMNEnvironmentFactory.java
@@ -766,20 +766,20 @@ public Type externalFunctionReturnFEELType(TNamedElement element, Expression<Typ
 
     @Override
     public Environment makeEnvironment(TDRGElement element) {
-        Environment environment = this.environmentMemoizer.get(element);
-        if (environment == null) {
-            environment = makeEnvironmentNoCache(element);
-            this.environmentMemoizer.put(element, environment);
+        // No caching when is not strongly typed, input data types might be inferred from input data
+        if (this.dmnTransformer.isStrongTyping()) {
+            Environment environment = this.environmentMemoizer.get(element);
+            if (environment == null) {
+                environment = makeEnvironmentNoCache(element);
+                this.environmentMemoizer.put(element, environment);
+            }
+            return environment;
+        } else {
+            return makeEnvironmentNoCache(element);
         }
-        return environment;
     }
 
     private Environment makeEnvironmentNoCache(TDRGElement element) {
-        return makeEnvironment(element, true);
-    }
-
-    @Override
-    public Environment makeEnvironment(TDRGElement element, boolean isRecursive) {
         TDefinitions definitions = this.dmnModelRepository.getModel(element);
 
         try {
@@ -797,7 +797,8 @@ public Environment makeEnvironment(TDRGElement element, boolean isRecursive) {
             // Add it to cache to avoid infinite loops
             this.environmentMemoizer.put(element, elementEnvironment);
             // Add declaration of element to support recursion
-            if (isRecursive) {
+            boolean recursiveCalls = this.dmnTransformer.isRecursiveCalls() && this.dmnTransformer.isStrongTyping();
+            if (recursiveCalls && element instanceof TBusinessKnowledgeModel) {
                 Declaration declaration = makeDeclaration(element, elementEnvironment, element);
                 addDeclaration(elementEnvironment, declaration, element, element);
             }
diff --git a/dmn-core/src/main/java/com/gs/dmn/validation/TypeRefValidator.java b/dmn-core/src/main/java/com/gs/dmn/validation/TypeRefValidator.java
@@ -150,7 +150,7 @@ private Type inferType(TDRGElement element, BasicDMNToJavaTransformer dmnTransfo
                 type = dmnEnvironmentFactory.toFEELType(model, typeRef);
             } else {
                 TExpression expression = dmnModelRepository.expression(element);
-                DMNContext globalContext = dmnTransformer.makeGlobalContext(element, false);
+                DMNContext globalContext = dmnTransformer.makeGlobalContext(element);
                 type = dmnEnvironmentFactory.expressionType(element, expression, globalContext);
             }
         } catch (Exception e) {
diff --git a/dmn-core/src/test/java/com/gs/dmn/transformation/CL3TckDMNToJavaTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/transformation/CL3TckDMNToJavaTransformerTest.java
@@ -62,7 +62,7 @@ public void testCL3() throws Exception {
         doFolderTest("1.5","1157-implicit-conversions");
 
         // extensions
-        doFolderTest("1.1", "9001-recursive-function");
+        doFolderTest("1.1", "9001-recursive-function", new Pair<>("recursiveCalls", "true"));
     }
 
     @Test
diff --git a/dmn-core/src/test/java/com/gs/dmn/transformation/CL3TckDMNToKotlinTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/transformation/CL3TckDMNToKotlinTransformerTest.java
@@ -12,6 +12,7 @@
  */
 package com.gs.dmn.transformation;
 
+import com.gs.dmn.runtime.Pair;
 import org.junit.jupiter.api.Test;
 
 public class CL3TckDMNToKotlinTransformerTest extends AbstractTckDMNToKotlinTransformerTest {
@@ -39,6 +40,6 @@ public void testCL3() throws Exception {
         doFolderTest("1.1", "0030-user-defined-functions");
         doFolderTest("1.1", "0031-static-user-defined-functions");
 
-        doFolderTest("1.1", "9001-recursive-function");
+        doFolderTest("1.1", "9001-recursive-function", new Pair<>("recursiveCalls", "true"));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ private Type inferType(TDRGElement element, BasicDMNToJavaTransformer dmnTransfo`
`150`	`150`	`type = dmnEnvironmentFactory.toFEELType(model, typeRef);`
`151`	`151`	`} else {`
`152`	`152`	`TExpression expression = dmnModelRepository.expression(element);`
`153`		`- DMNContext globalContext = dmnTransformer.makeGlobalContext(element, false);`
	`153`	`+ DMNContext globalContext = dmnTransformer.makeGlobalContext(element);`
`154`	`154`	`type = dmnEnvironmentFactory.expressionType(element, expression, globalContext);`
`155`	`155`	`}`
`156`	`156`	`} catch (Exception e) {`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public void testCL3() throws Exception {`
`62`	`62`	`doFolderTest("1.5","1157-implicit-conversions");`
`63`	`63`
`64`	`64`	`// extensions`
`65`		`- doFolderTest("1.1", "9001-recursive-function");`
	`65`	`+ doFolderTest("1.1", "9001-recursive-function", new Pair<>("recursiveCalls", "true"));`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`*/`
`13`	`13`	`package com.gs.dmn.transformation;`
`14`	`14`
	`15`	`+import com.gs.dmn.runtime.Pair;`
`15`	`16`	`import org.junit.jupiter.api.Test;`
`16`	`17`
`17`	`18`	`public class CL3TckDMNToKotlinTransformerTest extends AbstractTckDMNToKotlinTransformerTest {`
`@@ -39,6 +40,6 @@ public void testCL3() throws Exception {`
`39`	`40`	`doFolderTest("1.1", "0030-user-defined-functions");`
`40`	`41`	`doFolderTest("1.1", "0031-static-user-defined-functions");`
`41`	`42`
`42`		`- doFolderTest("1.1", "9001-recursive-function");`
	`43`	`+ doFolderTest("1.1", "9001-recursive-function", new Pair<>("recursiveCalls", "true"));`
`43`	`44`	`}`
`44`	`45`	`}`