MAT-7300: Set signature level to overloads

MeasureAuthoringTool · Jul 19, 2024 · 2f1635b · 2f1635b
1 parent 2039787
commit 2f1635b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/main/java/gov/cms/mat/cql_elm_translation/cql_translator/TranslationResource.java b/src/main/java/gov/cms/mat/cql_elm_translation/cql_translator/TranslationResource.java
@@ -114,7 +114,7 @@ public CqlTranslator buildTranslator(
       VersionedIdentifier sourceInfo) {
     try {
       UcumService ucumService = null;
-      LibraryBuilder.SignatureLevel signatureLevel = LibraryBuilder.SignatureLevel.None;
+      LibraryBuilder.SignatureLevel signatureLevel = LibraryBuilder.SignatureLevel.Overloads;
       List<CqlCompilerOptions.Options> optionsList = new ArrayList<>();
 
       for (String key : params.keySet()) {
@@ -147,6 +147,7 @@ public CqlTranslator buildTranslator(
       NamespaceInfo nsInfo = null;
 
       libraryManager.setUcumService(ucumService);
+      libraryManager.getCqlCompilerOptions().setSignatureLevel(signatureLevel);
       libraryManager.getCqlCompilerOptions().setOptions(options);
       CqlTranslator translator =
           CqlTranslator.fromStream(nsInfo, sourceInfo, cqlStream, libraryManager);

diff --git a/src/main/java/gov/cms/mat/cql_elm_translation/service/EffectiveDataRequirementService.java b/src/main/java/gov/cms/mat/cql_elm_translation/service/EffectiveDataRequirementService.java
@@ -9,6 +9,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.cqframework.cql.cql2elm.CqlCompilerOptions;
 import org.cqframework.cql.cql2elm.CqlTranslator;
+import org.cqframework.cql.cql2elm.LibraryBuilder;
 import org.cqframework.cql.cql2elm.LibraryManager;
 import org.cqframework.cql.cql2elm.model.CompiledLibrary;
 import org.cqframework.cql.elm.requirements.fhir.DataRequirementsProcessor;
@@ -60,6 +61,7 @@ public org.hl7.fhir.r5.model.Library getEffectiveDataRequirements(
     var dqReqTrans = new DataRequirementsProcessor();
     CqlCompilerOptions options = CqlCompilerOptions.defaultOptions();
     options.setCollapseDataRequirements(true); // removing duplicate data requirements
+    options.setSignatureLevel(LibraryBuilder.SignatureLevel.Overloads);
 
     org.hl7.fhir.r5.model.Library effectiveDataRequirements =
         dqReqTrans.gatherDataRequirements(

diff --git a/src/main/java/gov/cms/mat/cql_elm_translation/utils/cql/parsing/Cql2ElmListener.java b/src/main/java/gov/cms/mat/cql_elm_translation/utils/cql/parsing/Cql2ElmListener.java
@@ -27,6 +27,7 @@
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.tree.ParseTreeWalker;
 import org.apache.commons.collections4.CollectionUtils;
+import org.cqframework.cql.cql2elm.CqlCompilerOptions;
 import org.cqframework.cql.cql2elm.LibraryBuilder;
 import org.cqframework.cql.cql2elm.model.CompiledLibrary;
 import org.cqframework.cql.cql2elm.preprocessor.CqlPreprocessorVisitor;
@@ -651,8 +652,10 @@ private void parseChildLibraries(IncludeDef def) throws IOException {
 
     // Add CqlCompilerOptions from LibraryManager to prevent NPE while walking through CQL
     LibraryBuilder libraryBuilder = new LibraryBuilder(translationResource.getLibraryManager());
+    CqlCompilerOptions options = translationResource.getLibraryManager().getCqlCompilerOptions();
+    options.setSignatureLevel(LibraryBuilder.SignatureLevel.Overloads);
     libraryBuilder.setCompilerOptions(
-        translationResource.getLibraryManager().getCqlCompilerOptions());
+        options);
     CqlPreprocessorVisitor preprocessor = new CqlPreprocessorVisitor(libraryBuilder, tokens);
     preprocessor.visit(tree);
     ParseTreeWalker walker = new ParseTreeWalker();